---

yaml --- r: 181202 b: refs/heads/master c: d85429a h: refs/heads/master v: v3
git-mirror · Feb 16, 2010 · 587c289 · 587c289
1 parent 7aa2761
commit 587c289
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
 };