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
/
serio
/
gscps2.c
diff --git
a/drivers/input/serio/gscps2.c
b/drivers/input/serio/gscps2.c
index
c0b1e4b
..
cde036a
100644
(file)
--- a/
drivers/input/serio/gscps2.c
+++ b/
drivers/input/serio/gscps2.c
@@
-22,7
+22,6
@@
* was usable/enabled ?)
*/
* was usable/enabled ?)
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/serio.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/serio.h>
@@
-371,7
+370,7
@@
static int __init gscps2_probe(struct parisc_device *dev)
serio->dev.parent = &dev->dev;
ret = -EBUSY;
serio->dev.parent = &dev->dev;
ret = -EBUSY;
- if (request_irq(dev->irq, gscps2_interrupt,
SA_SHIRQ
, ps2port->port->name, ps2port))
+ if (request_irq(dev->irq, gscps2_interrupt,
IRQF_SHARED
, ps2port->port->name, ps2port))
goto fail_miserably;
if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {
goto fail_miserably;
if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) {