diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 17:52:54 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 17:52:54 -0500 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /include/linux/attribute_container.h | |
| parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
| parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'include/linux/attribute_container.h')
| -rw-r--r-- | include/linux/attribute_container.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h index ee83fe64a102..93bfb0beb62a 100644 --- a/include/linux/attribute_container.h +++ b/include/linux/attribute_container.h @@ -11,12 +11,12 @@ #include <linux/device.h> #include <linux/list.h> +#include <linux/klist.h> #include <linux/spinlock.h> struct attribute_container { struct list_head node; - struct list_head containers; - spinlock_t containers_lock; + struct klist containers; struct class *class; struct class_device_attribute **attrs; int (*match)(struct attribute_container *, struct device *); |