Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[pandora-kernel.git] / arch / arm / mach-ixp4xx / nslu2-pci.c

diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index a575f2e..0de639d 100644 (file)
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 
@@ -28,14 +27,6 @@ void __init nslu2_pci_preinit(void)
        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQT_LOW);
        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQT_LOW);
 
-       gpio_line_isr_clear(NSLU2_PCI_INTA_PIN);
-       gpio_line_isr_clear(NSLU2_PCI_INTB_PIN);
-       gpio_line_isr_clear(NSLU2_PCI_INTC_PIN);
-
-       /* INTD is not configured as GPIO is used
-        * for the power input button.
-        */
-
        ixp4xx_pci_preinit();
 }