diff options
| author | Russell King | 2008-10-09 22:33:02 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-09 22:33:02 +0200 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/mach-s3c2410 | |
| parent | Merge branch 'at91' into devel (diff) | |
| parent | [ARM] 5239/1: Palm Zire 72 power management support (diff) | |
| download | kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.gz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.xz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.zip | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/bast-irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c index 604224a2d9a6..75738000272b 100644 --- a/arch/arm/mach-s3c2410/bast-irq.c +++ b/arch/arm/mach-s3c2410/bast-irq.c @@ -130,8 +130,7 @@ bast_irq_pc104_demux(unsigned int irq, for (i = 0; stat != 0; i++, stat >>= 1) { if (stat & 1) { irqno = bast_pc104_irqs[i]; - desc = irq_desc + irqno; - desc_handle_irq(irqno, desc); + generic_handle_irq(irqno); } } } |