diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-05-14 01:44:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-05-14 01:44:08 -0700 |
| commit | 3004c70f9036bbb74ea2842995edc8a21de9106e (patch) | |
| tree | be89c6ef4881d7749556bc63fb2fdc82d09ecadd /include/linux/kobject.h | |
| parent | 141baf80514374935d084c12f2f1e426e9cea5a0 (diff) | |
| parent | 51c0c34c8f0ac464c97aaef4754e7dc163dd586e (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/driver-2.6
Diffstat (limited to 'include/linux/kobject.h')
| -rw-r--r-- | include/linux/kobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index f32f39b4cce6..6360d225884c 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -48,7 +48,7 @@ extern void kobject_cleanup(struct kobject *); extern int kobject_add(struct kobject *); extern void kobject_del(struct kobject *); -extern void kobject_rename(struct kobject *, char *new_name); +extern int kobject_rename(struct kobject *, char *new_name); extern int kobject_register(struct kobject *); extern void kobject_unregister(struct kobject *); |