Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc

[sfrench/cifs-2.6.git] / drivers / video / pxafb.c

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 389530bf1adab886090cb33cbf6bcacf3305bcb3..1d1e4f175e7844cb0eae129060e4a4d93f78c7c2 100644 (file)
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -2181,7 +2181,7 @@ static int __devinit pxafb_probe(struct platform_device *dev)
                goto failed_free_mem;
        }
 
-       ret = request_irq(irq, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi);
+       ret = request_irq(irq, pxafb_handle_irq, 0, "LCD", fbi);
        if (ret) {
                dev_err(&dev->dev, "request_irq failed: %d\n", ret);
                ret = -EBUSY;