diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-07 09:16:35 -0400 |
| commit | ad73c67e792c752ddc99f2b0587abae05255dd6d (patch) | |
| tree | e33d5d37a8c56b6fad753fa2d481f43cfb60ae1d /arch/arm/mach-omap2 | |
| parent | 08eac93a689ca05c7b7413f6d362c7d38b5fd5b1 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-omap2')
| -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, |