aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kobject.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-05-17 18:53:14 -0400
committerTony Luck <tony.luck@intel.com>2005-05-17 18:53:14 -0400
commit325a479c4c110db278ef3361460a48c4093252cc (patch)
treebcfbf4d0647d9442045639a5c19da59d55190e81 /lib/kobject.c
parentebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff)
parent7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff)
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'lib/kobject.c')
-rw-r--r--lib/kobject.c3
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)
216/** 216/**
217 * kobject_set_name - Set the name of an object 217 * kobject_set_name - Set the name of an object
218 * @kobj: object. 218 * @kobj: object.
219 * @name: name. 219 * @fmt: format string used to build the name
220 * 220 *
221 * If strlen(name) >= KOBJ_NAME_LEN, then use a dynamically allocated 221 * If strlen(name) >= KOBJ_NAME_LEN, then use a dynamically allocated
222 * string that @kobj->k_name points to. Otherwise, use the static 222 * string that @kobj->k_name points to. Otherwise, use the static
223 * @kobj->name array. 223 * @kobj->name array.
224 */ 224 */
225
226int kobject_set_name(struct kobject * kobj, const char * fmt, ...) 225int kobject_set_name(struct kobject * kobj, const char * fmt, ...)
227{ 226{
228 int error = 0; 227 int error = 0;