Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaef4d6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  kobject: Documentation Spelling Patch
  dev_set_name: fix missing kernel-doc
parents da50ccc6 acccafe9

Documentation/kobject.txt

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ should not be manipulated by any other user. 


A kset keeps its children in a standard kernel linked list.  Kobjects point

back to their containing kset via their kset field. In almost all cases,

the kobjects belonging to a ket have that kset (or, strictly, its embedded

the kobjects belonging to a kset have that kset (or, strictly, its embedded

kobject) in their parent.



As a kset contains a kobject within it, it should always be dynamically

drivers/base/core.c

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ static void device_remove_class_symlinks(struct device *dev) 
/**

 * dev_set_name - set a device name

 * @dev: device

 * @fmt: format string for the device's name

 */

int dev_set_name(struct device *dev, const char *fmt, ...)

{