diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:26:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-14 02:26:40 -0700 |
| commit | a0d4e51c1a5e5d031aa9dd1fb2fa207ccfafe627 (patch) | |
| tree | 84e11f0a0f05db79a9f70d688904b224bb4ecedb /include/linux/kobject.h | |
| parent | be9bc8d1f307a4c57b51284eb1393fcd950f9c4c (diff) | |
| parent | 3004c70f9036bbb74ea2842995edc8a21de9106e (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
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 *); |