diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/arm/mach-pxa/mainstone.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 827b7b5a5be8..85fdb5b1470a 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -72,7 +72,7 @@ static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc, | |||
| 72 | if (likely(pending)) { | 72 | if (likely(pending)) { |
| 73 | irq = MAINSTONE_IRQ(0) + __ffs(pending); | 73 | irq = MAINSTONE_IRQ(0) + __ffs(pending); |
| 74 | desc = irq_desc + irq; | 74 | desc = irq_desc + irq; |
| 75 | desc->handle(irq, desc, regs); | 75 | desc_handle_irq(irq, desc, regs); |
| 76 | } | 76 | } |
| 77 | pending = MST_INTSETCLR & mainstone_irq_enabled; | 77 | pending = MST_INTSETCLR & mainstone_irq_enabled; |
| 78 | } while (pending); | 78 | } while (pending); |