Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / arm / mach-integrator / time.c

diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
index bc07f52a6fd797e2a51be9190ee4e773772fe20b..8508a0db3eaf53ce213a5190ac0877c057e2f791 100644 (file)
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -96,8 +96,7 @@ static struct rtc_ops rtc_ops = {
        .set_alarm      = integrator_rtc_set_alarm,
 };
 
-static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,
-                                    struct pt_regs *regs)
+static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id)
 {
        writel(0, rtc_base + RTC_EOI);
        return IRQ_HANDLED;
@@ -125,7 +124,10 @@ static int rtc_probe(struct amba_device *dev, void *id)
 
        xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
 
-       ret = request_irq(dev->irq[0], arm_rtc_interrupt, SA_INTERRUPT,
+       /* note that 'dev' is merely used for irq disambiguation;
+        * it is not actually referenced in the irq handler
+        */
+       ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED,
                          "rtc-pl030", dev);
        if (ret)
                goto map_out;