Merge remote-tracking branch 'agust/next' into merge

[~andy/linux] / drivers / watchdog / coh901327_wdt.c

diff --git a/drivers/watchdog/coh901327_wdt.c b/drivers/watchdog/coh901327_wdt.c
index 9291506b8b235012fd9825f42bc2c6dad6c26f1b..03f449a430d253ca997f0e84e721748707fb674f 100644 (file)
--- a/drivers/watchdog/coh901327_wdt.c
+++ b/drivers/watchdog/coh901327_wdt.c
@@ -429,7 +429,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
        writew(U300_WDOG_SR_RESET_STATUS_RESET, virtbase + U300_WDOG_SR);
 
        irq = platform_get_irq(pdev, 0);
-       if (request_irq(irq, coh901327_interrupt, IRQF_DISABLED,
+       if (request_irq(irq, coh901327_interrupt, 0,
                        DRV_NAME " Bark", pdev)) {
                ret = -EIO;
                goto out_no_irq;