diff --git a/[refs] b/[refs]
index 49c3bc5b87af..8a0c7e23f553 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bbda4e4aca4591c85ee53dea157ca5fc9a23306
+refs/heads/master: 29775df10f02f614db870ff4acaf0b07dbed1547
diff --git a/trunk/drivers/sh/intc/chip.c b/trunk/drivers/sh/intc/chip.c
index 3679645427c1..d90cb7e43920 100644
--- a/trunk/drivers/sh/intc/chip.c
+++ b/trunk/drivers/sh/intc/chip.c
@@ -218,7 +218,6 @@ struct irq_chip intc_irq_chip	= {
 	.irq_mask_ack		= intc_mask_ack,
 	.irq_enable		= intc_enable,
 	.irq_disable		= intc_disable,
-	.irq_shutdown		= intc_disable,
 	.irq_set_type		= intc_set_type,
 #ifdef CONFIG_SMP
 	.irq_set_affinity	= intc_set_affinity,