From 53627bfd81cb40457a92003eab837a662463c171 Mon Sep 17 00:00:00 2001 From: Deepak Saxena Date: Wed, 4 Jan 2006 17:17:12 +0000 Subject: [PATCH] --- yaml --- r: 16752 b: refs/heads/master c: 8d27e6992bc6a7ca7eaa1d29fb1a8d6cb6022c45 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ixp4xx/nas100d-pci.c | 6 ------ trunk/arch/arm/mach-ixp4xx/nas100d-power.c | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5d2fcbabcc81..78dc9f925af3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3145d8a6cc83ee15adf18f598873e53a54cd1841 +refs/heads/master: 8d27e6992bc6a7ca7eaa1d29fb1a8d6cb6022c45 diff --git a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c b/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c index 9bd029462359..26b7c001ff64 100644 --- a/trunk/arch/arm/mach-ixp4xx/nas100d-pci.c +++ b/trunk/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 --git a/trunk/arch/arm/mach-ixp4xx/nas100d-power.c b/trunk/arch/arm/mach-ixp4xx/nas100d-power.c index c74a19004390..2bec69bfa715 100644 --- a/trunk/arch/arm/mach-ixp4xx/nas100d-power.c +++ b/trunk/arch/arm/mach-ixp4xx/nas100d-power.c @@ -42,8 +42,6 @@ static int __init nas100d_power_init(void) set_irq_type(NAS100D_RB_IRQ, IRQT_LOW); - gpio_line_isr_clear(NAS100D_RB_GPIO); - if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler, SA_INTERRUPT, "NAS100D reset button", NULL) < 0) {