Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg

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

diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index 799af43b4e6a1f80dd830f70ff08c688a1d8ec6e..44ca018e1f9654ff07e90973ad572d8a3601ecbb 100644 (file)
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -56,7 +56,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/samsung-time.h>
 
@@ -813,7 +812,7 @@ MACHINE_START(RX1950, "HP iPAQ RX1950")
        .atag_offset = 0x100,
        .map_io = rx1950_map_io,
        .reserve        = rx1950_reserve,
-       .init_irq = s3c24xx_init_irq,
+       .init_irq       = s3c2442_init_irq,
        .init_machine = rx1950_init_machine,
        .init_time      = samsung_timer_init,
        .restart        = s3c244x_restart,