Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp4xx / ixdpg425-pci.c

diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index fe5e7660de1d5e855594b45a6fdaf7cd4c152655..ed52708002174e222f635ef3c701fc1b8dbabbf7 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -16,10 +16,10 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
-#include <asm/irq.h>
 
 #include <asm/mach/pci.h>
 
@@ -32,9 +32,6 @@ void __init ixdpg425_pci_preinit(void)
        set_irq_type(IRQ_IXP4XX_GPIO6, IRQT_LOW);
        set_irq_type(IRQ_IXP4XX_GPIO7, IRQT_LOW);
 
-       gpio_line_isr_clear(6);
-       gpio_line_isr_clear(7);
-
        ixp4xx_pci_preinit();
 }