lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2011-01-10 16:10:33 -08:00
parent 949f6711b8 c6c0ac664c
commit e54be894ea
6 changed files with 70 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/device.h
View File

@@ -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 {