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-shark/irq.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/arm/mach-shark/irq.c')
| -rw-r--r-- | arch/arm/mach-shark/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c index 6cb67bd3dfd3..b227052296cf 100644 --- a/arch/arm/mach-shark/irq.c +++ b/arch/arm/mach-shark/irq.c | |||
| @@ -69,7 +69,8 @@ static irqreturn_t bogus_int(int irq, void *dev_id, struct pt_regs *regs) | |||
| 69 | 69 | ||
| 70 | static struct irqaction cascade; | 70 | static struct irqaction cascade; |
| 71 | 71 | ||
| 72 | static struct irqchip fb_chip = { | 72 | static struct irq_chip fb_chip = { |
| 73 | .name = "XT-PIC", | ||
| 73 | .ack = shark_ack_8259A_irq, | 74 | .ack = shark_ack_8259A_irq, |
| 74 | .mask = shark_disable_8259A_irq, | 75 | .mask = shark_disable_8259A_irq, |
| 75 | .unmask = shark_enable_8259A_irq, | 76 | .unmask = shark_enable_8259A_irq, |