From 0f6bd03ff7bf17559d83c7e77465fddab0e3fb05 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 10 Jan 2012 13:33:23 +0900
Subject: [PATCH] --- yaml --- r: 283647 b: refs/heads/master c:
 77761b63d94bcd04bb3f02b1b52716698202276a h: refs/heads/master i:   283645:
 95dd08503dba4a15652882a152e7a9ed78282313   283643:
 b15898b543324920d4e62ee0ab0d53d75ca2db5c   283639:
 7cb2c132e9d118e2ab7eb6cd16d823b39e2d0701   283631:
 7c1a6bc87cc06f26adaa2ff4928fa5c414779fc5   283615:
 114e4c4770ccf12ab5dadb4a4eaab532b99dc9a3   283583:
 51e92da83b11b458db8962cb5943238f10d8d3ba   283519:
 f303c8b3a980d884776f688ac7ce7a5d2bef6fed   283391:
 c0cafdedf4c03c8b23a8a76ce750d9b0ca2b7f27   283135:
 563fc3a3cb5b0ec2e991a7f4a06d10b976340cb1   282623:
 7b721a835fc3ba2e92fb62739a92ef05a78ead45 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-shmobile/board-marzen.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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