diff --git a/[refs] b/[refs] index 9d03a1bc2b06..1d26bedf52b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86abc23ed146522b276f63032574f358bcfe0392 +refs/heads/master: a9196b0bd3284fa3388998c9208a708a8f2e4c83 diff --git a/trunk/drivers/rtc/rtc-puv3.c b/trunk/drivers/rtc/rtc-puv3.c index e4b6880aabd0..540ead3cb3c7 100644 --- a/trunk/drivers/rtc/rtc-puv3.c +++ b/trunk/drivers/rtc/rtc-puv3.c @@ -164,7 +164,7 @@ static int puv3_rtc_open(struct device *dev) int ret; ret = request_irq(puv3_rtc_alarmno, puv3_rtc_alarmirq, - IRQF_DISABLED, "pkunity-rtc alarm", rtc_dev); + 0, "pkunity-rtc alarm", rtc_dev); if (ret) { dev_err(dev, "IRQ%d error %d\n", puv3_rtc_alarmno, ret); @@ -172,7 +172,7 @@ static int puv3_rtc_open(struct device *dev) } ret = request_irq(puv3_rtc_tickno, puv3_rtc_tickirq, - IRQF_DISABLED, "pkunity-rtc tick", rtc_dev); + 0, "pkunity-rtc tick", rtc_dev); if (ret) { dev_err(dev, "IRQ%d error %d\n", puv3_rtc_tickno, ret);