diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:53:13 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:53:13 +0000 |
commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-nomadik/board-nhk8815.c | |
parent | e195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff) | |
parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
download | linux-next-23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8.tar.gz |
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-nomadik/board-nhk8815.c')
-rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index f98259c050ee..7c878bf00340 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -35,6 +35,8 @@ #include <mach/nand.h> #include <mach/fsmc.h> +#include "cpu-8815.h" + /* Initial value for SRC control register: all timers use MXTAL/8 source */ #define SRC_CR_INIT_MASK 0x00007fff #define SRC_CR_INIT_VAL 0x2aaa8000 @@ -284,4 +286,5 @@ MACHINE_START(NOMADIK, "NHK8815") .handle_irq = vic_handle_irq, .timer = &nomadik_timer, .init_machine = nhk8815_platform_init, + .restart = cpu8815_restart, MACHINE_END |