Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[safe/jmp/linux-2.6] / drivers / base / base.h

diff --git a/drivers/base/base.h b/drivers/base/base.h
index c035dc2..31dc0cd 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -44,7 +44,7 @@ struct driver_private {
  * @class_devices - list of devices associated with this class
  * @class_interfaces - list of class_interfaces associated with this class
  * @class_dirs - "glue" directory for virtual devices associated with this class
- * @class_sem - semaphore to protect the children, devices, and interfaces lists.
+ * @class_mutex - mutex to protect the children, devices, and interfaces lists.
  * @class - pointer back to the struct class that this structure is associated
  * with.
  *
@@ -57,7 +57,7 @@ struct class_private {
        struct list_head class_devices;
        struct list_head class_interfaces;
        struct kset class_dirs;
-       struct semaphore class_sem;
+       struct mutex class_mutex;
        struct class *class;
 };
 #define to_class(obj)  \