diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:14:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 17:14:07 +0100 |
| commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (patch) | |
| tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 /arch/arm/mach-mmp/flint.c | |
| parent | Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | Merge branch 'samsung/dt' into samsung/cleanup (diff) | |
| download | linux-142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6.tar.xz linux-142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6.zip | |
Merge branch 'samsung/cleanup' into samsung/driver
Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c
More changes to a file that got moved into common.c,
see previous conflict resolutions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/flint.c')
| -rw-r--r-- | arch/arm/mach-mmp/flint.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c index c4fd806b15b4..5a6a27a6cfd0 100644 --- a/arch/arm/mach-mmp/flint.c +++ b/arch/arm/mach-mmp/flint.c @@ -121,4 +121,5 @@ MACHINE_START(FLINT, "Flint Development Platform") .init_irq = mmp2_init_irq, .timer = &mmp2_timer, .init_machine = flint_init, + .restart = mmp_restart, MACHINE_END |