Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / char / nwbutton.c

diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index cfdfe493c6af007a4d2455ab0315ef2611d8ebb3..1fd00dc0689721ae967af86aa2c88dbb903ddef2 100644 (file)
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -220,7 +220,7 @@ static int __init nwbutton_init(void)
                return -EBUSY;
        }
 
-       if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED,
+       if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, 0,
                        "nwbutton", NULL)) {
                printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",
                                IRQ_NETWINDER_BUTTON);