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

[karo-tx-linux.git] / drivers / base / base.h

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 24f424249d9b517089b82c2436042751eec3aa42..251c5d30f963060d3fec65b61205ae0225f141a5 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -63,8 +63,6 @@ struct driver_private {
  *     binding of drivers which were unable to get all the resources needed by
  *     the device; typically because it depends on another driver getting
  *     probed first.
- * @driver_data - private pointer for driver specific info.  Will turn into a
- * list soon.
  * @device - pointer back to the struct class that this structure is
  * associated with.
  *
@@ -76,7 +74,6 @@ struct device_private {
        struct klist_node knode_driver;
        struct klist_node knode_bus;
        struct list_head deferred_probe;
-       void *driver_data;
        struct device *device;
 };
 #define to_device_private_parent(obj)  \