diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /lib/kobject.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
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 94048826624c..dd0917dd9fa9 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -279,7 +279,7 @@ EXPORT_SYMBOL(kobject_set_name); | |||
| 279 | * @new_name: object's new name | 279 | * @new_name: object's new name |
| 280 | */ | 280 | */ |
| 281 | 281 | ||
| 282 | int kobject_rename(struct kobject * kobj, char *new_name) | 282 | int kobject_rename(struct kobject * kobj, const char *new_name) |
| 283 | { | 283 | { |
| 284 | int error = 0; | 284 | int error = 0; |
| 285 | 285 | ||