[PATCH] w1: Use mutexes instead of semaphores.

[pandora-kernel.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index e8c96e6..6caccfc 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -41,8 +41,7 @@ struct w1_reg_num
 
 #include <linux/completion.h>
 #include <linux/device.h>
-
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #include "w1_family.h"
 
@@ -171,7 +170,7 @@ struct w1_master
        long                    flags;
 
        struct task_struct      *thread;
-       struct semaphore        mutex;
+       struct mutex            mutex;
 
        struct device_driver    *driver;
        struct device           dev;