diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /lib/kobject.c | |
| parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 718e5101c263..dcade0543bd2 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -439,6 +439,7 @@ out: | |||
| 439 | 439 | ||
| 440 | return error; | 440 | return error; |
| 441 | } | 441 | } |
| 442 | EXPORT_SYMBOL_GPL(kobject_rename); | ||
| 442 | 443 | ||
| 443 | /** | 444 | /** |
| 444 | * kobject_move - move object to another parent | 445 | * kobject_move - move object to another parent |