Merge branch 'x86/defconfig' into x86/mce2

[linux-2.6-omap-h63xx.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 7d9da4b4993feae592388717bff9ffedb0e60531..47f343c7bddaaca551c8fb2114160fb5f362c4e1 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -28,7 +28,6 @@
 #define BUS_ID_SIZE            20
 
 struct device;
-struct device_private;
 struct device_driver;
 struct driver_private;
 struct class;
@@ -148,6 +147,8 @@ extern void put_driver(struct device_driver *drv);
 extern struct device_driver *driver_find(const char *name,
                                         struct bus_type *bus);
 extern int driver_probe_done(void);
+extern int wait_for_device_probe(void);
+
 
 /* sysfs interface for exporting driver attributes */
 
@@ -366,10 +367,12 @@ struct device_dma_parameters {
 };
 
 struct device {
+       struct klist            klist_children;
+       struct klist_node       knode_parent;   /* node in sibling list */
+       struct klist_node       knode_driver;
+       struct klist_node       knode_bus;
        struct device           *parent;
 
-       struct device_private   *p;
-
        struct kobject kobj;
        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
        unsigned                uevent_suppress:1;