Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[linux-2.6-omap-h63xx.git] / drivers / base / base.h

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 7c4fafc314c42f6be3c50fb9e5509b5cd59ff29f..ddc97496db4a4af3a1c7438b43622d621264ab13 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -68,6 +68,8 @@ struct class_private {
  *
  * @klist_children - klist containing all children of this device
  * @knode_parent - node in sibling list
+ * @knode_driver - node in driver list
+ * @knode_bus - node in bus list
  * @device - pointer back to the struct class that this structure is
  * associated with.
  *
@@ -76,10 +78,16 @@ struct class_private {
 struct device_private {
        struct klist klist_children;
        struct klist_node knode_parent;
+       struct klist_node knode_driver;
+       struct klist_node knode_bus;
        struct device *device;
 };
 #define to_device_private_parent(obj)  \
        container_of(obj, struct device_private, knode_parent)
+#define to_device_private_driver(obj)  \
+       container_of(obj, struct device_private, knode_driver)
+#define to_device_private_bus(obj)     \
+       container_of(obj, struct device_private, knode_bus)
 
 /* initialisation functions */
 extern int devices_init(void);