summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-01-18 23:16:04 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 14:21:51 -0800
commit5c085d369c2c4f18942ec8951466e186366d5c78 (patch)
tree22ca525700049a402281a0503b07db0645075f58 /include/linux
parent7656032b904b936eca65a41afa1f2b3603195657 (diff)
[PATCH] i2c: Semaphore to mutex conversions, part 2
semaphore to mutex conversion. the conversion was generated via scripts, and the result was validated automatically via a script as well. build tested. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 63f1d63cc1d..1635ee25918 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -32,7 +32,7 @@
#include <linux/mod_devicetable.h>
#include <linux/device.h> /* for struct device */
#include <linux/sched.h> /* for completion */
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
/* --- For i2c-isa ---------------------------------------------------- */
@@ -225,8 +225,8 @@ struct i2c_adapter {
int (*client_unregister)(struct i2c_client *);
/* data fields that are valid for all devices */
- struct semaphore bus_lock;
- struct semaphore clist_lock;
+ struct mutex bus_lock;
+ struct mutex clist_lock;
int timeout;
int retries;