diff --git a/[refs] b/[refs]
index 486fecb46222..0022a79f96f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92e1f9a7ed613b36f3aaf8b04a79e2fd4fa37ec1
+refs/heads/master: d85429a31790361b9e952be3817134c23b3b758a
diff --git a/trunk/drivers/sh/intc.c b/trunk/drivers/sh/intc.c
index 66594eb4477d..1da1edef2221 100644
--- a/trunk/drivers/sh/intc.c
+++ b/trunk/drivers/sh/intc.c
@@ -851,6 +851,9 @@ void __init register_intc_controller(struct intc_desc *desc)
 		d->chip.mask_ack = intc_mask_ack;
 	}
 
+	/* disable bits matching force_disable before registering irqs */
+	if (desc->force_disable)
+		intc_enable_disable_enum(desc, d, desc->force_disable, 0);
 
 	/* disable bits matching force_enable before registering irqs */
 	if (desc->force_enable)
diff --git a/trunk/include/linux/sh_intc.h b/trunk/include/linux/sh_intc.h
index 66b4b0c45e71..51d288d8ac88 100644
--- a/trunk/include/linux/sh_intc.h
+++ b/trunk/include/linux/sh_intc.h
@@ -72,6 +72,7 @@ struct intc_hw_desc {
 struct intc_desc {
 	char *name;
 	intc_enum force_enable;
+	intc_enum force_disable;
 	struct intc_hw_desc hw;
 };