diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 10:08:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 10:08:08 -0800 |
commit | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (patch) | |
tree | d92277ec77dbaf6f04a1ab4fe31a974c1ce51f76 /Documentation/DocBook/deviceiobook.tmpl | |
parent | 4f57d865f1d863346ac50db9c25859e73a86499c (diff) | |
parent | b4d20859362fde976bb2fa53eb51b798cdba1afc (diff) | |
download | talos-obmc-linux-a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99.tar.gz talos-obmc-linux-a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99.zip |
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 'Documentation/DocBook/deviceiobook.tmpl')
-rw-r--r-- | Documentation/DocBook/deviceiobook.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl index c1ed6a49e598..54199a0dcf9a 100644 --- a/Documentation/DocBook/deviceiobook.tmpl +++ b/Documentation/DocBook/deviceiobook.tmpl @@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) <chapter id="pubfunctions"> <title>Public Functions Provided</title> !Iarch/x86/include/asm/io.h -!Elib/iomap.c +!Elib/pci_iomap.c </chapter> </book> |