diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:24:14 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:24:14 +1100 |
| commit | e9558ba068472c9d495ca573417e76674a4edb4d (patch) | |
| tree | 328ac6e14cc4684af6fc4079d8fb3bf013a77ff4 /include | |
| parent | a184e8deb1c1c18017899720382382f308923a9d (diff) | |
| parent | c6c0ac664c86ff6408fadbed4913938c8a732e26 (diff) | |
Merge remote branch 'driver-core/driver-core-next'
Diffstat (limited to 'include')
| -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 { |