[ARM] 3220/1: Remove gpio_isr_line_clear() from NAS 100d

Patch from Deepak Saxena

This patch removes referneces to gpio_isr_line_clear() from the
NAS 100d platform implementation.

Depends on 3192/1 and 3215/1

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index 9bd029462359e9da5807571340087ab56cf2a455..26b7c001ff64d6c5a5336377459443e4e1f10961 100644 (file)
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -30,12 +30,6 @@ void __init nas100d_pci_preinit(void)
        set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW);
        set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW);
 
-       gpio_line_isr_clear(NAS100D_PCI_INTA_PIN);
-       gpio_line_isr_clear(NAS100D_PCI_INTB_PIN);
-       gpio_line_isr_clear(NAS100D_PCI_INTC_PIN);
-       gpio_line_isr_clear(NAS100D_PCI_INTD_PIN);
-       gpio_line_isr_clear(NAS100D_PCI_INTE_PIN);
-
        ixp4xx_pci_preinit();
 }
 

diff --cc arch/arm/mach-ixp4xx/nas100d-power.c
Simple merge