Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / mach-s3c24xx / mach-tct_hammer.c

diff --git a/arch/arm/mach-s3c24xx/mach-tct_hammer.c b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
index 31dfe589e34972130ce3482cdea2f21442489900..7fad8f055cabc050b5aba9e1ecaf82c2fc1998f9 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c24xx/mach-tct_hammer.c
@@ -149,7 +149,7 @@ static void __init tct_hammer_init(void)
 MACHINE_START(TCT_HAMMER, "TCT_HAMMER")
        .atag_offset    = 0x100,
        .map_io         = tct_hammer_map_io,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2410_init_irq,
        .init_machine   = tct_hammer_init,
        .init_time      = samsung_timer_init,
        .restart        = s3c2410_restart,