mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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
This commit is contained in:
commit
845199f194
2 changed files with 8 additions and 11 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue