diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 16:23:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 16:23:54 -0700 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/sh/intc.c | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/sh/intc.c')
| -rw-r--r-- | drivers/sh/intc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c index 3a5a17db947..c2750391fd3 100644 --- a/drivers/sh/intc.c +++ b/drivers/sh/intc.c @@ -762,6 +762,10 @@ static void __init intc_register_irq(struct intc_desc *desc, if (desc->hw.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, @@ -1024,8 +1028,12 @@ unsigned int create_irq_nr(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; } |