diff options
| -rw-r--r-- | Documentation/kobject.txt | 2 | ||||
| -rw-r--r-- | drivers/base/core.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index bf3256e04027..51a8021ee532 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
| @@ -305,7 +305,7 @@ should not be manipulated by any other user. | |||
| 305 | 305 | ||
| 306 | A kset keeps its children in a standard kernel linked list. Kobjects point | 306 | A kset keeps its children in a standard kernel linked list. Kobjects point |
| 307 | back to their containing kset via their kset field. In almost all cases, | 307 | back to their containing kset via their kset field. In almost all cases, |
| 308 | the kobjects belonging to a ket have that kset (or, strictly, its embedded | 308 | the kobjects belonging to a kset have that kset (or, strictly, its embedded |
| 309 | kobject) in their parent. | 309 | kobject) in their parent. |
| 310 | 310 | ||
| 311 | As a kset contains a kobject within it, it should always be dynamically | 311 | As a kset contains a kobject within it, it should always be dynamically |
diff --git a/drivers/base/core.c b/drivers/base/core.c index 422cfcad486d..ee0a51a3a41d 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -762,6 +762,7 @@ static void device_remove_class_symlinks(struct device *dev) | |||
| 762 | /** | 762 | /** |
| 763 | * dev_set_name - set a device name | 763 | * dev_set_name - set a device name |
| 764 | * @dev: device | 764 | * @dev: device |
| 765 | * @fmt: format string for the device's name | ||
| 765 | */ | 766 | */ |
| 766 | int dev_set_name(struct device *dev, const char *fmt, ...) | 767 | int dev_set_name(struct device *dev, const char *fmt, ...) |
| 767 | { | 768 | { |
