Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6] / include / linux / attribute_container.h

diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h
index f54b05b052b3106474dea7cd6c108820c4241abe..f5582332af046d4cb00ea31b3beeebccd7da2384 100644 (file)
--- a/include/linux/attribute_container.h
+++ b/include/linux/attribute_container.h
@@ -11,13 +11,13 @@
 
 #include <linux/device.h>
 #include <linux/list.h>
-#include <linux/spinlock.h>
+#include <linux/klist.h>
 
 struct attribute_container {
        struct list_head        node;
-       struct list_head        containers;
-       spinlock_t              containers_lock;
+       struct klist            containers;
        struct class            *class;
+       struct attribute_group  *grp;
        struct class_device_attribute **attrs;
        int (*match)(struct attribute_container *, struct device *);
 #define        ATTRIBUTE_CONTAINER_NO_CLASSDEVS        0x01
@@ -64,6 +64,7 @@ int attribute_container_add_class_device_adapter(struct attribute_container *con
                                                 struct class_device *classdev);
 void attribute_container_remove_attrs(struct class_device *classdev);
 void attribute_container_class_device_del(struct class_device *classdev);
+struct attribute_container *attribute_container_classdev_to_container(struct class_device *);
 struct class_device *attribute_container_find_class_device(struct attribute_container *, struct device *);
 struct class_device_attribute **attribute_container_classdev_to_attrs(const struct class_device *classdev);