Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 2 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 5df8441c44e7..94048826624c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -216,13 +216,12 @@ int kobject_register(struct kobject * kobj)
 /**
  *      kobject_set_name - Set the name of an object
  *      @kobj:  object.
- *      @name:  name. 
+ *      @fmt:   format string used to build the name
  *
  *      If strlen(name) >= KOBJ_NAME_LEN, then use a dynamically allocated
  *      string that @kobj->k_name points to. Otherwise, use the static 
  *      @kobj->name array.
  */
-
 int kobject_set_name(struct kobject * kobj, const char * fmt, ...)
 {
         int error = 0;