diff options
Diffstat (limited to 'arch/arm/mach-ixp23xx/core.c')
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index 051e3d70026..566a07821c7 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * warranty of any kind, whether express or implied. | 14 | * warranty of any kind, whether express or implied. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/config.h> | ||
18 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
20 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
@@ -272,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs * | |||
272 | } | 271 | } |
273 | 272 | ||
274 | int_desc = irq_desc + irqno; | 273 | int_desc = irq_desc + irqno; |
275 | int_desc->handle(irqno, int_desc, regs); | 274 | desc_handle_irq(irqno, int_desc, regs); |
276 | 275 | ||
277 | desc->chip->unmask(irq); | 276 | desc->chip->unmask(irq); |
278 | } | 277 | } |
@@ -364,7 +363,7 @@ ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
364 | static struct irqaction ixp23xx_timer_irq = { | 363 | static struct irqaction ixp23xx_timer_irq = { |
365 | .name = "IXP23xx Timer Tick", | 364 | .name = "IXP23xx Timer Tick", |
366 | .handler = ixp23xx_timer_interrupt, | 365 | .handler = ixp23xx_timer_interrupt, |
367 | .flags = SA_INTERRUPT | SA_TIMER, | 366 | .flags = IRQF_DISABLED | IRQF_TIMER, |
368 | }; | 367 | }; |
369 | 368 | ||
370 | void __init ixp23xx_init_timer(void) | 369 | void __init ixp23xx_init_timer(void) |