diff options
author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
---|---|---|
committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-s3c24xx/mach-qt2410.c | |
parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-qt2410.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-qt2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c index 7b6ba13d728..56175f0941b 100644 --- a/arch/arm/mach-s3c24xx/mach-qt2410.c +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c @@ -343,6 +343,6 @@ MACHINE_START(QT2410, "QT2410") .map_io = qt2410_map_io, .init_irq = s3c24xx_init_irq, .init_machine = qt2410_machine_init, - .timer = &s3c24xx_timer, + .init_time = s3c24xx_timer_init, .restart = s3c2410_restart, MACHINE_END |