diff options
| -rw-r--r-- | arch/arm/mach-ixp2000/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 3cfc5aab8259..b31f31ac937b 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/irq.h> | ||
| 22 | #include <linux/serial.h> | 23 | #include <linux/serial.h> |
| 23 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
| 24 | #include <linux/bitops.h> | 25 | #include <linux/bitops.h> |
| @@ -408,7 +409,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc, str | |||
| 408 | for(i = 31; i >= 0; i--) { | 409 | for(i = 31; i >= 0; i--) { |
| 409 | if(status & (1 << i)) { | 410 | if(status & (1 << i)) { |
| 410 | desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i; | 411 | desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i; |
| 411 | desc->handle(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs); | 412 | desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs); |
| 412 | } | 413 | } |
| 413 | } | 414 | } |
| 414 | } | 415 | } |
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 9b8ded259807..40eef8b36740 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
| @@ -167,7 +167,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | /* Hook into PCI interrupt */ | 169 | /* Hook into PCI interrupt */ |
| 170 | set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x00_irq_handler); | 170 | set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | /************************************************************************* | 173 | /************************************************************************* |
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 8477ae1d8f72..7f42366f60d1 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
| @@ -127,7 +127,7 @@ void __init ixdp2x01_init_irq(void) | |||
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | /* Hook into PCI interrupts */ | 129 | /* Hook into PCI interrupts */ |
| 130 | set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x01_irq_handler); | 130 | set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | 133 | ||
