aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-pci.c6
-rw-r--r--arch/arm/mach-ixp4xx/nas100d-power.c2
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index 9bd029462359..26b7c001ff64 100644
--- 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)
30 set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW); 30 set_irq_type(IRQ_NAS100D_PCI_INTD, IRQT_LOW);
31 set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW); 31 set_irq_type(IRQ_NAS100D_PCI_INTE, IRQT_LOW);
32 32
33 gpio_line_isr_clear(NAS100D_PCI_INTA_PIN);
34 gpio_line_isr_clear(NAS100D_PCI_INTB_PIN);
35 gpio_line_isr_clear(NAS100D_PCI_INTC_PIN);
36 gpio_line_isr_clear(NAS100D_PCI_INTD_PIN);
37 gpio_line_isr_clear(NAS100D_PCI_INTE_PIN);
38
39 ixp4xx_pci_preinit(); 33 ixp4xx_pci_preinit();
40} 34}
41 35
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index c74a19004390..2bec69bfa715 100644
--- a/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -42,8 +42,6 @@ static int __init nas100d_power_init(void)
42 42
43 set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); 43 set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);
44 44
45 gpio_line_isr_clear(NAS100D_RB_GPIO);
46
47 if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, 45 if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler,
48 SA_INTERRUPT, "NAS100D reset button", NULL) < 0) { 46 SA_INTERRUPT, "NAS100D reset button", NULL) < 0) {
49 47