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
This commit is contained in:
Linus Torvalds
2008-06-11 17:29:06 -07:00
2 changed files with 2 additions and 1 deletions

View File

@@ -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 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, 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. kobject) in their parent.
As a kset contains a kobject within it, it should always be dynamically As a kset contains a kobject within it, it should always be dynamically

View File

@@ -762,6 +762,7 @@ static void device_remove_class_symlinks(struct device *dev)
/** /**
* dev_set_name - set a device name * dev_set_name - set a device name
* @dev: device * @dev: device
* @fmt: format string for the device's name
*/ */
int dev_set_name(struct device *dev, const char *fmt, ...) int dev_set_name(struct device *dev, const char *fmt, ...)
{ {