diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 07:45:47 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 07:45:47 +0200 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/arm/mach-h720x | |
| parent | [ACPI] revert bad processor_core.c patch for bug 5128 (diff) | |
| parent | [SCSI] Re-do "final klist fixes" (diff) | |
| download | linux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz linux-64e47488c913ac704d465a6af86a26786d1412a5.zip | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/arm/mach-h720x')
| -rw-r--r-- | arch/arm/mach-h720x/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/common.c b/arch/arm/mach-h720x/common.c index 96aa3af70d86..5110e2e65ddd 100644 --- a/arch/arm/mach-h720x/common.c +++ b/arch/arm/mach-h720x/common.c @@ -108,7 +108,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq, while (mask) { if (mask & 1) { IRQDBG("handling irq %d\n", irq); - desc->handle(irq, desc, regs); + desc_handle_irq(irq, desc, regs); } irq++; desc++; diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 593b6a2a30e1..4b3199319e68 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c @@ -126,7 +126,7 @@ h7202_timerx_demux_handler(unsigned int irq_unused, struct irqdesc *desc, desc = irq_desc + irq; while (mask) { if (mask & 1) - desc->handle(irq, desc, regs); + desc_handle_irq(irq, desc, regs); irq++; desc++; mask >>= 1; |