diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 21:53:13 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 21:53:13 +0100 |
commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-tegra/board-trimslice.c | |
parent | Merge branch 'tegra/soc' into next/soc (diff) | |
parent | Merge branch 'restart' into for-linus (diff) | |
download | linux-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.xz 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-trimslice.c')
-rw-r--r-- | arch/arm/mach-tegra/board-trimslice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c index 4a197a20be93..cd52820a3e37 100644 --- a/arch/arm/mach-tegra/board-trimslice.c +++ b/arch/arm/mach-tegra/board-trimslice.c @@ -180,4 +180,5 @@ MACHINE_START(TRIMSLICE, "trimslice") .handle_irq = gic_handle_irq, .timer = &tegra_timer, .init_machine = tegra_trimslice_init, + .restart = tegra_assert_system_reset, MACHINE_END |