diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /lib/kobject.c | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
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 |