diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 08:42:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 08:42:21 -0700 |
| commit | 845199f194306dbd69ca42d3b40a5125cdb50b89 (patch) | |
| tree | efffb64ec9996578076682e53177dcff7f4a994c /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
| parent | arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups (diff) | |
| download | linux-dev-845199f194306dbd69ca42d3b40a5125cdb50b89.tar.xz linux-dev-845199f194306dbd69ca42d3b40a5125cdb50b89.zip | |
Merge branch 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
arm/mach-integrator/time.c, mwave: revert portions of recent irq cleanups
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/time.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index 5235f64f235b..8508a0db3eaf 100644 --- 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; |