Merge branch 'postmerge' into for-linus

[karo-tx-linux.git] / arch / arm / mach-s3c24xx / mach-nexcoder.c

diff --git a/arch/arm/mach-s3c24xx/mach-nexcoder.c b/arch/arm/mach-s3c24xx/mach-nexcoder.c
index 5c826d10a66d2f1499b3ed8465c341b549f62afb..01f4354206f99e9f423d2bc31f3c8d0fa37712ef 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-nexcoder.c
+++ b/arch/arm/mach-s3c24xx/mach-nexcoder.c
@@ -152,7 +152,7 @@ MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
        .atag_offset    = 0x100,
        .map_io         = nexcoder_map_io,
        .init_machine   = nexcoder_init,
-       .init_irq       = s3c24xx_init_irq,
+       .init_irq       = s3c2440_init_irq,
        .init_time      = samsung_timer_init,
        .restart        = s3c244x_restart,
 MACHINE_END