diff --git a/[refs] b/[refs] index 65d227e4b8d1..81039fc7854e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ecba2cf8c72e2c5831a9ee16df0b46aff8acceb +refs/heads/master: 77761b63d94bcd04bb3f02b1b52716698202276a diff --git a/trunk/arch/arm/mach-shmobile/board-marzen.c b/trunk/arch/arm/mach-shmobile/board-marzen.c index a72c650047bc..f0e02c0ce99f 100644 --- a/trunk/arch/arm/mach-shmobile/board-marzen.c +++ b/trunk/arch/arm/mach-shmobile/board-marzen.c @@ -151,7 +151,7 @@ MACHINE_START(MARZEN, "marzen") .init_early = marzen_init_early, .nr_irqs = NR_IRQS_LEGACY, .init_irq = r8a7779_init_irq, - .handle_irq = shmobile_handle_irq_gic, + .handle_irq = gic_handle_irq, .init_machine = marzen_init, .timer = &marzen_timer, MACHINE_END