git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
drivers
/
input
/
joystick
/
guillemot.c
diff --git
a/drivers/input/joystick/guillemot.c
b/drivers/input/joystick/guillemot.c
index
d4e8073
..
25ec3fa
100644
(file)
--- a/
drivers/input/joystick/guillemot.c
+++ b/
drivers/input/joystick/guillemot.c
@@
-1,6
+1,4
@@
/*
/*
- * $Id: guillemot.c,v 1.10 2002/01/22 20:28:12 vojtech Exp $
- *
* Copyright (c) 2001 Vojtech Pavlik
*/
* Copyright (c) 2001 Vojtech Pavlik
*/
@@
-238,7
+236,7
@@
static int guillemot_connect(struct gameport *gameport, struct gameport_driver *
input_dev->open = guillemot_open;
input_dev->close = guillemot_close;
input_dev->open = guillemot_open;
input_dev->close = guillemot_close;
- input_dev->evbit[0] = BIT
(EV_KEY) | BIT
(EV_ABS);
+ input_dev->evbit[0] = BIT
_MASK(EV_KEY) | BIT_MASK
(EV_ABS);
for (i = 0; (t = guillemot->type->abs[i]) >= 0; i++)
input_set_abs_params(input_dev, t, 0, 255, 0, 0);
for (i = 0; (t = guillemot->type->abs[i]) >= 0; i++)
input_set_abs_params(input_dev, t, 0, 255, 0, 0);