diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 17:29:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 17:29:06 -0700 |
| commit | aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211 (patch) | |
| tree | b8fbada3f36c0625e0f52a2e120ac97a1b00ce09 | |
| parent | da50ccc6a0f32ad29c1168837330a78e6e2e2923 (diff) | |
| parent | acccafe9ca63eac3a202d8805d286ada6ab8cced (diff) | |
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
| -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 bf3256e0402..51a8021ee53 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt @@ -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 diff --git a/drivers/base/core.c b/drivers/base/core.c index 422cfcad486..ee0a51a3a41 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -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, ...) { |