Merge commit 'v2.6.32' into reiserfs/kill-bkl

[karo-tx-linux.git] / drivers / rtc / rtc-tx4939.c

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 4ee4857ff207a863abfd430e278a70a908b561ed..4a6ed1104fbb4a86ca3579677d6a558384ceedc5 100644 (file)
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -261,10 +261,8 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 
        tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
        if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt,
-                            IRQF_DISABLED | IRQF_SHARED,
-                            pdev->name, &pdev->dev) < 0) {
+                            IRQF_DISABLED, pdev->name, &pdev->dev) < 0)
                return -EBUSY;
-       }
        rtc = rtc_device_register(pdev->name, &pdev->dev,
                                  &tx4939_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc))