[ARM] 3612/1: make pci bus optional for ixp4xx platform

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp4xx / nas100d-power.c

diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index c74a190043901659d79143af3aeac9fd934178c7..99d333d7ebdd56c0d9424a5851efe3baaa55a080 100644 (file)
--- 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)
 
        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) {
 
@@ -58,6 +56,9 @@ static int __init nas100d_power_init(void)
 
 static void __exit nas100d_power_exit(void)
 {
+       if (!(machine_is_nas100d()))
+               return;
+
        free_irq(NAS100D_RB_IRQ, NULL);
 }