diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-s3c64xx/mach-smartq7.c | |
| parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq7.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index 9077b85785ca..37bb0c632a5e 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c @@ -171,6 +171,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7") .map_io = smartq_map_io, .init_machine = smartq7_machine_init, .init_late = s3c64xx_init_late, - .timer = &s3c24xx_timer, + .init_time = s3c24xx_timer_init, .restart = s3c64xx_restart, MACHINE_END |