linux 2.6.16.38 w/ vs2.0.3-rc1

[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 e9924d6..146f406 100644 (file)
--- 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 */