diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /arch/arm/mach-omap1/irq.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
| -rw-r--r-- | arch/arm/mach-omap1/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 9e039845b50e..3ea140bb9eba 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
| @@ -168,7 +168,8 @@ static struct omap_irq_bank omap1610_irq_banks[] = { | |||
| 168 | }; | 168 | }; |
| 169 | #endif | 169 | #endif |
| 170 | 170 | ||
| 171 | static struct irqchip omap_irq_chip = { | 171 | static struct irq_chip omap_irq_chip = { |
| 172 | .name = "MPU", | ||
| 172 | .ack = omap_mask_ack_irq, | 173 | .ack = omap_mask_ack_irq, |
| 173 | .mask = omap_mask_irq, | 174 | .mask = omap_mask_irq, |
| 174 | .unmask = omap_unmask_irq, | 175 | .unmask = omap_unmask_irq, |