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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
bce247b
..
668f245
100644
(file)
--- a/
drivers/input/joystick/iforce/iforce.h
+++ b/
drivers/input/joystick/iforce/iforce.h
@@
-37,7
+37,7
@@
#include <linux/serio.h>
#include <linux/config.h>
#include <linux/circ_buf.h>
#include <linux/serio.h>
#include <linux/config.h>
#include <linux/circ_buf.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
/* This module provides arbitrary resource management routines.
* I use it to manage the device's memory.
/* This module provides arbitrary resource management routines.
* I use it to manage the device's memory.
@@
-45,6
+45,7
@@
*/
#include <linux/ioport.h>
*/
#include <linux/ioport.h>
+
#define IFORCE_MAX_LENGTH 16
/* iforce::bus */
#define IFORCE_MAX_LENGTH 16
/* iforce::bus */
@@
-117,7
+118,7
@@
struct iforce_device {
};
struct iforce {
};
struct iforce {
- struct input_dev
dev;
/* Input device interface */
+ struct input_dev
*dev;
/* Input device interface */
struct iforce_device *type;
int bus;
struct iforce_device *type;
int bus;
@@
-146,7
+147,7
@@
struct iforce {
wait_queue_head_t wait;
struct resource device_memory;
struct iforce_core_effect core_effects[FF_EFFECTS_MAX];
wait_queue_head_t wait;
struct resource device_memory;
struct iforce_core_effect core_effects[FF_EFFECTS_MAX];
- struct
semaphore
mem_mutex;
+ struct
mutex
mem_mutex;
};
/* Get hi and low bytes of a 16-bits int */
};
/* Get hi and low bytes of a 16-bits int */