summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 15:56:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-21 15:56:19 -0700
commit98a1e95f9b5919b55c71a01546415074282d30d5 (patch)
tree7e539231ae9cf64614b6b9b358804ff8fdf056be /arch/arm/mach-integrator
parentabe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (diff)
parent896c6fa1e59dd17e1ac2877c25cab19bbb24e666 (diff)
downloadtalos-op-linux-98a1e95f9b5919b55c71a01546415074282d30d5.tar.gz
talos-op-linux-98a1e95f9b5919b55c71a01546415074282d30d5.zip
Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [ISDN] minor irq handler cleanups drivers/char: minor irq handler cleanups [PPC] minor irq handler cleanups [BLACKFIN] minor irq handler cleanups [SPARC] minor irq handler cleanups ARM minor irq handler cleanup: avoid passing unused info to irq
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c
index 5278f589fcee..5235f64f235b 100644
--- a/arch/arm/mach-integrator/time.c
+++ b/arch/arm/mach-integrator/time.c
@@ -125,7 +125,7 @@ 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, IRQF_DISABLED,
- "rtc-pl030", dev);
+ "rtc-pl030", NULL);
if (ret)
goto map_out;
OpenPOWER on IntegriCloud