Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6

[~andy/linux] / drivers / input / touchscreen / w90p910_ts.c

diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c
index 7a45d68c35166d62d2e2404d3f65644b32cea42c..217aa51135c59bda6a9e50498749030c3a593303 100644 (file)
--- a/drivers/input/touchscreen/w90p910_ts.c
+++ b/drivers/input/touchscreen/w90p910_ts.c
@@ -279,7 +279,7 @@ static int __devinit w90x900ts_probe(struct platform_device *pdev)
 
        w90p910_ts->irq_num = platform_get_irq(pdev, 0);
        if (request_irq(w90p910_ts->irq_num, w90p910_ts_interrupt,
-                       IRQF_DISABLED, "w90p910ts", w90p910_ts)) {
+                       0, "w90p910ts", w90p910_ts)) {
                err = -EBUSY;
                goto fail4;
        }