Merge branches 'fixes' and 'misc' into for-next

[deliverable/linux.git] / arch / arm / mach-ixp4xx / nas100d-setup.c

diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 507cb52335373eb3d8857cb2c2380b4e642b7baf..4e0f762bc651a8d7b9ffd380825eb26cedf68a50 100644 (file)
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -295,8 +295,7 @@ static void __init nas100d_init(void)
        pm_power_off = nas100d_power_off;
 
        if (request_irq(gpio_to_irq(NAS100D_RB_GPIO), &nas100d_reset_handler,
-               IRQF_DISABLED | IRQF_TRIGGER_LOW,
-               "NAS100D reset button", NULL) < 0) {
+               IRQF_TRIGGER_LOW, "NAS100D reset button", NULL) < 0) {
 
                printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                        gpio_to_irq(NAS100D_RB_GPIO));