diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx/ixdp2351.c')
-rw-r--r-- | arch/arm/mach-ixp23xx/ixdp2351.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c index bba9d9f08691..37a32e6bcca2 100644 --- a/arch/arm/mach-ixp23xx/ixdp2351.c +++ b/arch/arm/mach-ixp23xx/ixdp2351.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> |
@@ -36,7 +37,6 @@ | |||
36 | #include <asm/memory.h> | 37 | #include <asm/memory.h> |
37 | #include <asm/hardware.h> | 38 | #include <asm/hardware.h> |
38 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
39 | #include <asm/irq.h> | ||
40 | #include <asm/system.h> | 40 | #include <asm/system.h> |
41 | #include <asm/tlbflush.h> | 41 | #include <asm/tlbflush.h> |
42 | #include <asm/pgtable.h> | 42 | #include <asm/pgtable.h> |
@@ -74,7 +74,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct | |||
74 | int cpld_irq = | 74 | int cpld_irq = |
75 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); | 75 | IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i); |
76 | cpld_desc = irq_desc + cpld_irq; | 76 | cpld_desc = irq_desc + cpld_irq; |
77 | cpld_desc->handle(cpld_irq, cpld_desc, regs); | 77 | desc_handle_irq(cpld_irq, cpld_desc, regs); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
@@ -111,7 +111,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct | |||
111 | int cpld_irq = | 111 | int cpld_irq = |
112 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); | 112 | IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i); |
113 | cpld_desc = irq_desc + cpld_irq; | 113 | cpld_desc = irq_desc + cpld_irq; |
114 | cpld_desc->handle(cpld_irq, cpld_desc, regs); | 114 | desc_handle_irq(cpld_irq, cpld_desc, regs); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
@@ -158,8 +158,8 @@ void ixdp2351_init_irq(void) | |||
158 | } | 158 | } |
159 | } | 159 | } |
160 | 160 | ||
161 | set_irq_chained_handler(IRQ_IXP23XX_INTA, &ixdp2351_inta_handler); | 161 | set_irq_chained_handler(IRQ_IXP23XX_INTA, ixdp2351_inta_handler); |
162 | set_irq_chained_handler(IRQ_IXP23XX_INTB, &ixdp2351_intb_handler); | 162 | set_irq_chained_handler(IRQ_IXP23XX_INTB, ixdp2351_intb_handler); |
163 | } | 163 | } |
164 | 164 | ||
165 | /* | 165 | /* |