diff options
| author | Linus Torvalds | 2011-01-11 01:10:33 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-01-11 01:10:33 +0100 |
| commit | e54be894eae10eca9892e965cc9532f5d5a11767 (patch) | |
| tree | 27ace4446e42058ef4813a34bf63b55a870e7a12 /include/linux | |
| parent | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | driver core: Document that device_rename() is only for networking (diff) | |
| download | kernel-qcow2-linux-e54be894eae10eca9892e965cc9532f5d5a11767.tar.gz kernel-qcow2-linux-e54be894eae10eca9892e965cc9532f5d5a11767.tar.xz kernel-qcow2-linux-e54be894eae10eca9892e965cc9532f5d5a11767.zip | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
driver core: Document that device_rename() is only for networking
sysfs: remove useless test from sysfs_merge_group
driver-core: merge private parts of class and bus
driver core: fix whitespace in class_attr_string
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index d96af9701d60..1bf5cf0b4513 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -30,9 +30,8 @@ struct device_private; struct device_driver; struct driver_private; struct class; -struct class_private; +struct subsys_private; struct bus_type; -struct bus_type_private; struct device_node; struct bus_attribute { @@ -65,7 +64,7 @@ struct bus_type { const struct dev_pm_ops *pm; - struct bus_type_private *p; + struct subsys_private *p; }; extern int __must_check bus_register(struct bus_type *bus); @@ -214,7 +213,7 @@ struct class { const struct dev_pm_ops *pm; - struct class_private *p; + struct subsys_private *p; }; struct class_dev_iter { |