Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187605
b: refs/heads/master
c: 65a5b28
h: refs/heads/master
i:
  187603: cae2b10
v: v3
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Feb 8, 2010
1 parent 83df74c commit e9d4a73
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 13d605de2ece8c8f7c17a88747d90b7931350ee5
refs/heads/master: 65a5b28f0af00dddd785b516914739460562638f
10 changes: 9 additions & 1 deletion trunk/drivers/sh/intc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e9d4a73

Please sign in to comment.