diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 18:06:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-09 18:06:12 -0500 |
commit | 926beadb3dfaddccb3348a5b9e6c2a1f8290a220 (patch) | |
tree | 97e2005e61e33635315eb7cfc991a8952a4d38f0 /include/linux/device.h | |
parent | e2d4077678c7ec7661003c268120582adc544897 (diff) |
Revert "driver core: create a private portion of struct device"
This reverts commit 2831fe6f9cc4e16c103504ee09a47a084297c0f3.
Turns out that device_initialize shouldn't fail silently.
This series needs to be reworked in order to get into proper
shape.
Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 2975351635d3..45e5b1921fbb 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -28,7 +28,6 @@ | |||
28 | #define BUS_ID_SIZE 20 | 28 | #define BUS_ID_SIZE 20 |
29 | 29 | ||
30 | struct device; | 30 | struct device; |
31 | struct device_private; | ||
32 | struct device_driver; | 31 | struct device_driver; |
33 | struct driver_private; | 32 | struct driver_private; |
34 | struct class; | 33 | struct class; |
@@ -372,8 +371,6 @@ struct device { | |||
372 | struct klist_node knode_bus; | 371 | struct klist_node knode_bus; |
373 | struct device *parent; | 372 | struct device *parent; |
374 | 373 | ||
375 | struct device_private *p; | ||
376 | |||
377 | struct kobject kobj; | 374 | struct kobject kobj; |
378 | char bus_id[BUS_ID_SIZE]; /* position on parent bus */ | 375 | char bus_id[BUS_ID_SIZE]; /* position on parent bus */ |
379 | unsigned uevent_suppress:1; | 376 | unsigned uevent_suppress:1; |