Merge branch 'x86-spinlocks-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / input / keyboard / davinci_keyscan.c

diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index cd89d17..9d82b3a 100644 (file)
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -271,7 +271,7 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
        }
 
        error = request_irq(davinci_ks->irq, davinci_ks_interrupt,
-                         IRQF_DISABLED, pdev->name, davinci_ks);
+                         0, pdev->name, davinci_ks);
        if (error < 0) {
                dev_err(dev, "unable to register davinci key scan interrupt\n");
                goto fail5;