diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 03:09:11 -0400 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /arch/arm/mach-omap2/irq.c | |
| parent | 5cf13911b1e72707b6f0eb39b2d819ec6e343d76 (diff) | |
| parent | 81b73dd92b97423b8f5324a59044da478c04f4c4 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 3eed6a737bf8..dfc3b35cc1ff 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -94,7 +94,8 @@ static void omap_mask_ack_irq(unsigned int irq) | |||
| 94 | omap_ack_irq(irq); | 94 | omap_ack_irq(irq); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | static struct irqchip omap_irq_chip = { | 97 | static struct irq_chip omap_irq_chip = { |
| 98 | .name = "INTC", | ||
| 98 | .ack = omap_mask_ack_irq, | 99 | .ack = omap_mask_ack_irq, |
| 99 | .mask = omap_mask_irq, | 100 | .mask = omap_mask_irq, |
| 100 | .unmask = omap_unmask_irq, | 101 | .unmask = omap_unmask_irq, |