diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 16:30:20 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 16:42:17 +0400 |
| commit | 237c78beb8a988453bac1993d21f025d070a0d8d (patch) | |
| tree | 9864f0924650770881141359a2d5bac623949789 /arch/arm/mach-iop32x/em7210.c | |
| parent | 4eb821999086417ab42a15174b51497122fc406e (diff) | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
| download | linux-237c78beb8a988453bac1993d21f025d070a0d8d.tar.xz | |
Merge branch 'depends/rmk/for-linus' into samsung/dt
Conflicts:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/cpu.c -> common.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-exynos/init.c -> common.c
arch/arm/mach-s5p64x0/init.c -> common.c
arch/arm/mach-s5pv210/init.c -> common.c
Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-iop32x/em7210.c')
| -rw-r--r-- | arch/arm/mach-iop32x/em7210.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c index 4325055d4e19..24069e03fdc1 100644 --- a/arch/arm/mach-iop32x/em7210.c +++ b/arch/arm/mach-iop32x/em7210.c @@ -208,4 +208,5 @@ MACHINE_START(EM7210, "Lanner EM7210") .init_irq = iop32x_init_irq, .timer = &em7210_timer, .init_machine = em7210_init_machine, + .restart = iop3xx_restart, MACHINE_END |