Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
	arch/arm/Kconfig

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index d5d7f23c19a5..926013bece12 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -658,6 +658,10 @@ static void __init intc_register_irq(struct intc_desc *desc,
 
         if (desc->ack_regs)
                 ack_handle[irq] = intc_ack_data(desc, d, enum_id);
+
+#ifdef CONFIG_ARM
+        set_irq_flags(irq, IRQF_VALID); /* Enable IRQ on ARM systems */
+#endif
 }
 
 static unsigned int __init save_reg(struct intc_desc_int *d,
@@ -902,8 +906,12 @@ static unsigned int create_irq_on_node(unsigned int irq_want, int node)
 out_unlock:
         spin_unlock_irqrestore(&vector_lock, flags);
 
-        if (irq > 0)
+        if (irq > 0) {
                 dynamic_irq_init(irq);
+#ifdef CONFIG_ARM
+                set_irq_flags(irq, IRQF_VALID); /* Enable IRQ on ARM systems */
+#endif
+        }
 
         return irq;
 }