diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:25:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:25:43 -0400 |
| commit | 17879857821adad4e180c5d6457c3b8bbf1d0c0c (patch) | |
| tree | 28afa4b59847ca13b8d51a83fa04954916387de9 /drivers/input | |
| parent | b62ad9ab181a67207a4c8c373461b587c4861a68 (diff) | |
| parent | 4877c737283813bdb4bebfa3168c1585f6e3a8ca (diff) | |
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
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 9946d73624b9..9dfd6e5f786f 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
| @@ -115,7 +115,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) | |||
| 115 | input_dev->event = ixp4xx_spkr_event; | 115 | input_dev->event = ixp4xx_spkr_event; |
| 116 | 116 | ||
| 117 | err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, | 117 | err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, |
| 118 | IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id); | 118 | IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper", |
| 119 | (void *) dev->id); | ||
| 119 | if (err) | 120 | if (err) |
| 120 | goto err_free_device; | 121 | goto err_free_device; |
| 121 | 122 | ||