diff options
| author | Arnd Bergmann | 2012-01-07 21:53:13 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-01-07 21:53:13 +0100 |
| commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
| tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-tegra/board-dt-tegra20.c | |
| parent | Merge branch 'tegra/soc' into next/soc (diff) | |
| parent | Merge branch 'restart' into for-linus (diff) | |
| download | kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.gz kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz kernel-qcow2-linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.zip | |
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index d1befbedbdea..47e1fa322f15 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -144,5 +144,6 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") .handle_irq = gic_handle_irq, .timer = &tegra_timer, .init_machine = tegra_dt_init, + .restart = tegra_assert_system_reset, .dt_compat = tegra20_dt_board_compat, MACHINE_END |