X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Finput%2Fjoystick%2Fiforce%2Fiforce.h;fp=drivers%2Finput%2Fjoystick%2Fiforce%2Fiforce.h;h=146f406b8f8a4dc25dbc248f4a8dce0dc5447f71;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=e9924d6f01b33991b975de0272588f6f0691ea7e;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h
index e9924d6f0..146f406b8 100644
--- a/drivers/input/joystick/iforce/iforce.h
+++ b/drivers/input/joystick/iforce/iforce.h
@@ -35,8 +35,9 @@
 #include <linux/spinlock.h>
 #include <linux/usb.h>
 #include <linux/serio.h>
+#include <linux/config.h>
 #include <linux/circ_buf.h>
-#include <linux/mutex.h>
+#include <asm/semaphore.h>
 
 /* This module provides arbitrary resource management routines.
  * I use it to manage the device's memory.
@@ -44,7 +45,6 @@
  */
 #include <linux/ioport.h>
 
-
 #define IFORCE_MAX_LENGTH	16
 
 /* iforce::bus */
@@ -146,7 +146,7 @@ struct iforce {
 	wait_queue_head_t wait;
 	struct resource device_memory;
 	struct iforce_core_effect core_effects[FF_EFFECTS_MAX];
-	struct mutex mem_mutex;
+	struct semaphore mem_mutex;
 };
 
 /* Get hi and low bytes of a 16-bits int */