diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 15:59:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 15:59:55 -0500 |
| commit | 733abe4fff3afa13e301bc8bc5bee9aac4b59fdc (patch) | |
| tree | c11f08a401783848deb7f41f65e990333971ba66 /lib | |
| parent | 5fe8252fc3a21666cf19053fbd7ec7bd9664f5d9 (diff) | |
| parent | 81bb0e198b4638ac65233b316f4588639dfe1fcd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Make PCI device numa-node attribute visible in sysfs
PCI: add systems for automatic breadth-first device sorting
PCI: PCI devices get assigned redundant IRQs
PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
PCI: pci.txt fix __devexit() usage
PCI/sysfs/kobject kernel-doc fixes
Diffstat (limited to 'lib')
| -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 93685f43bb9b..f4f6176dcd12 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -326,6 +326,7 @@ int kobject_rename(struct kobject * kobj, const char *new_name) | |||
| 326 | /** | 326 | /** |
| 327 | * kobject_rename - change the name of an object | 327 | * kobject_rename - change the name of an object |
| 328 | * @kobj: object in question. | 328 | * @kobj: object in question. |
| 329 | * @new_parent: object's new parent | ||
| 329 | * @new_name: object's new name | 330 | * @new_name: object's new name |
| 330 | */ | 331 | */ |
| 331 | 332 | ||