diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 13:08:08 -0500 |
| commit | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (patch) | |
| tree | d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76 /fs | |
| parent | 4f57d865f1d863346ac50db9c25859e73a86499c (diff) | |
| parent | b4d20859362fde976bb2fa53eb51b798cdba1afc (diff) | |
Merge branch 'kernel-doc' from Randy Dunlap
The usual kernel-doc fixups from Randy. Some of them David acked as
merged in his tree, this is the random left-overs.
* kernel-doc:
docbook: fix sched source file names in device-drivers book
docbook: change iomap source filename in deviceiobook
docbook: don't use serial_core.h in device-drivers book
kernel-doc: fix kernel-doc warnings in sched
kernel-doc: fix new warnings in cfg80211.h
kernel-doc: fix new warning in usb.h
kernel-doc: fix new warnings in device.h
kernel-doc: fix new warnings in debugfs
kernel-doc: fix new warning in regulator core
kernel-doc: fix new warnings in pci
kernel-doc: fix new warnings in driver-core
kernel-doc: fix new warnings in auditsc.c
scripts/kernel-doc: fix fatal error caused by cfg80211.h
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/debugfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index f65d4455c5e5..ef023eef0464 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c | |||
| @@ -540,7 +540,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_blob); | |||
| 540 | * debugfs_print_regs32 - use seq_print to describe a set of registers | 540 | * debugfs_print_regs32 - use seq_print to describe a set of registers |
| 541 | * @s: the seq_file structure being used to generate output | 541 | * @s: the seq_file structure being used to generate output |
| 542 | * @regs: an array if struct debugfs_reg32 structures | 542 | * @regs: an array if struct debugfs_reg32 structures |
| 543 | * @mregs: the length of the above array | 543 | * @nregs: the length of the above array |
| 544 | * @base: the base address to be used in reading the registers | 544 | * @base: the base address to be used in reading the registers |
| 545 | * @prefix: a string to be prefixed to every output line | 545 | * @prefix: a string to be prefixed to every output line |
| 546 | * | 546 | * |