Revert "driver core: create a private portion of struct device"

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

diff --git a/include/linux/device.h b/include/linux/device.h
index 7d9da4b4993feae592388717bff9ffedb0e60531..45e5b1921fbb5ceeb50a33514a423b53d9d46cd0 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;
@@ -366,10 +365,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;