Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / arch / sh / drivers / push-switch.c

diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index afc24556572bdc2863e6a022c1894a86ad8f92ff..637b79b096576d556e42b5d20cd31d856dd3465f 100644 (file)
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -63,7 +63,7 @@ static int switch_drv_probe(struct platform_device *pdev)
        BUG_ON(!psw_info);
 
        ret = request_irq(irq, psw_info->irq_handler,
-                         IRQF_DISABLED | psw_info->irq_flags,
+                         psw_info->irq_flags,
                          psw_info->name ? psw_info->name : DRV_NAME, pdev);
        if (unlikely(ret < 0))
                goto err;