diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
| commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
| tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-s3c24xx/mach-qt2410.c | |
| parent | Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-da... (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-440f39a4fda5d80f290e32f67bd084b63a41a436.tar.xz linux-440f39a4fda5d80f290e32f67bd084b63a41a436.zip | |
Merge branch 'depends/cleanup' into next/dt
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 7b6ba13d7285..56175f0941b1 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 |