diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
| commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (patch) | |
| tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 /arch/arm/mach-clps711x/cdb89712.c | |
| parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
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-clps711x/cdb89712.c')
| -rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 25b3bfd0e85a..c314f49d6ef6 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c | |||
| @@ -59,4 +59,5 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712") | |||
| 59 | .map_io = cdb89712_map_io, | 59 | .map_io = cdb89712_map_io, |
| 60 | .init_irq = clps711x_init_irq, | 60 | .init_irq = clps711x_init_irq, |
| 61 | .timer = &clps711x_timer, | 61 | .timer = &clps711x_timer, |
| 62 | .restart = clps711x_restart, | ||
| 62 | MACHINE_END | 63 | MACHINE_END |