diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /lib/kobject.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 0487d1f64806..a6dec32f2ddd 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -212,7 +212,7 @@ static int kobject_add_internal(struct kobject *kobj) | |||
| 212 | * @fmt: format string used to build the name | 212 | * @fmt: format string used to build the name |
| 213 | * @vargs: vargs to format the string. | 213 | * @vargs: vargs to format the string. |
| 214 | */ | 214 | */ |
| 215 | static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, | 215 | int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, |
| 216 | va_list vargs) | 216 | va_list vargs) |
| 217 | { | 217 | { |
| 218 | const char *old_name = kobj->name; | 218 | const char *old_name = kobj->name; |