Merge commit 'e26a9e0' into stable/for-linus-3.15

[linux-2.6-block.git] / arch / arm / mach-ixp4xx / nslu2-setup.c

diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index ba5f1cda2a9de20b00daf1f2bfb3e3ec3df6fb86..88c025f52d8d729dd329013d1cd6479cd9992f02 100644 (file)
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -265,16 +265,14 @@ static void __init nslu2_init(void)
        pm_power_off = nslu2_power_off;
 
        if (request_irq(gpio_to_irq(NSLU2_RB_GPIO), &nslu2_reset_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_LOW,
-               "NSLU2 reset button", NULL) < 0) {
+               IRQF_TRIGGER_LOW, "NSLU2 reset button", NULL) < 0) {
 
                printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                        gpio_to_irq(NSLU2_RB_GPIO));
        }
 
        if (request_irq(gpio_to_irq(NSLU2_PB_GPIO), &nslu2_power_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_HIGH,
-               "NSLU2 power button", NULL) < 0) {
+               IRQF_TRIGGER_HIGH, "NSLU2 power button", NULL) < 0) {
 
                printk(KERN_DEBUG "Power Button IRQ %d not available\n",
                        gpio_to_irq(NSLU2_PB_GPIO));