mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: Do not suspend IPI IRQs. powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt irq: Add new IRQ flag IRQF_NO_SUSPEND
This commit is contained in:
commit
1787985782
6 changed files with 18 additions and 9 deletions
|
|
@ -115,7 +115,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
|
|||
input_dev->event = ixp4xx_spkr_event;
|
||||
|
||||
err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
|
||||
IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id);
|
||||
IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper",
|
||||
(void *) dev->id);
|
||||
if (err)
|
||||
goto err_free_device;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue