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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
input
/
joystick
/
iforce
/
iforce.h
diff --git
a/drivers/input/joystick/iforce/iforce.h
b/drivers/input/joystick/iforce/iforce.h
index
5b90252
..
bce247b
100644
(file)
--- a/
drivers/input/joystick/iforce/iforce.h
+++ b/
drivers/input/joystick/iforce/iforce.h
@@
-141,7
+141,7
@@
struct iforce {
struct circ_buf xmit;
unsigned char xmit_data[XMIT_SIZE];
long xmit_flags[1];
struct circ_buf xmit;
unsigned char xmit_data[XMIT_SIZE];
long xmit_flags[1];
-
+
/* Force Feedback */
wait_queue_head_t wait;
struct resource device_memory;
/* Force Feedback */
wait_queue_head_t wait;
struct resource device_memory;
@@
-187,5
+187,5
@@
int iforce_upload_constant(struct iforce*, struct ff_effect*, int is_update);
int iforce_upload_condition(struct iforce*, struct ff_effect*, int is_update);
/* Public variables */
int iforce_upload_condition(struct iforce*, struct ff_effect*, int is_update);
/* Public variables */
-extern struct serio_d
ev iforce_serio_de
v;
+extern struct serio_d
river iforce_serio_dr
v;
extern struct usb_driver iforce_usb_driver;
extern struct usb_driver iforce_usb_driver;