diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /lib/kobject.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
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; |