git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
input
/
misc
/
ixp4xx-beeper.c
diff --git
a/drivers/input/misc/ixp4xx-beeper.c
b/drivers/input/misc/ixp4xx-beeper.c
index
3a6ae85
..
805b636
100644
(file)
--- a/
drivers/input/misc/ixp4xx-beeper.c
+++ b/
drivers/input/misc/ixp4xx-beeper.c
@@
-113,7
+113,7
@@
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,
input_dev->event = ixp4xx_spkr_event;
err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
-
SA_INTERRUPT | SA
_TIMER, "ixp4xx-beeper", (void *) dev->id);
+
IRQF_DISABLED | IRQF
_TIMER, "ixp4xx-beeper", (void *) dev->id);
if (err)
goto err_free_device;
if (err)
goto err_free_device;