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 5235f64f235b87f4b66355025a3d06a86dcaedfc..8508a0db3eaf53ce213a5190ac0877c057e2f791 100644 (file)
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -124,8 +124,11 @@ static int rtc_probe(struct amba_device *dev, void *id)
 
        xtime.tv_sec = __raw_readl(rtc_base + RTC_DR);
 
+       /* 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", NULL);
+                         "rtc-pl030", dev);
        if (ret)
                goto map_out;