Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp23xx / core.c

diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index df16a4eac4907ecb03862fbbe636750724da350a..aa4c4420ff3d9d5b9462fa914734eb4a493790ed 100644 (file)
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -32,8 +32,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
@@ -254,7 +253,6 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)
 {
        u32 pci_interrupt;
        unsigned int irqno;
-       struct irq_desc *int_desc;
 
        pci_interrupt = *IXP23XX_PCI_XSCALE_INT_STATUS;
 
@@ -269,8 +267,7 @@ static void pci_handler(unsigned int irq, struct irq_desc *desc)
                BUG();
        }
 
-       int_desc = irq_desc + irqno;
-       desc_handle_irq(irqno, int_desc);
+       generic_handle_irq(irqno);
 
        desc->chip->unmask(irq);
 }