Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[linux-beck.git] / drivers / i2c / busses / i2c-highlander.c

diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 3876a2478bd7a00d11c906aeb4503915a92075ac..63bb1cc2a042125fe87e2bf9243a4bc40ffc5ab8 100644 (file)
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -387,7 +387,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
                dev->irq = 0;
 
        if (dev->irq) {
-               ret = request_irq(dev->irq, highlander_i2c_irq, IRQF_DISABLED,
+               ret = request_irq(dev->irq, highlander_i2c_irq, 0,
                                  pdev->name, dev);
                if (unlikely(ret))
                        goto err_unmap;