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 /fs | |
| 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 'fs')
| -rw-r--r-- | fs/sysfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index c0e117649a4d..98b0910ad80c 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -54,7 +54,7 @@ static struct sysfs_ops subsys_sysfs_ops = { | |||
| 54 | /** | 54 | /** |
| 55 | * add_to_collection - add buffer to a collection | 55 | * add_to_collection - add buffer to a collection |
| 56 | * @buffer: buffer to be added | 56 | * @buffer: buffer to be added |
| 57 | * @node inode of set to add to | 57 | * @node: inode of set to add to |
| 58 | */ | 58 | */ |
| 59 | 59 | ||
| 60 | static inline void | 60 | static inline void |