Messages in this thread Patch in this message | | | Date | Tue, 2 Mar 2010 07:15:41 GMT | From | tip-bot for Randy Dunlap <> | Subject | [tip:x86/doc] x86, docbook: Fix errors from x86 headers merger |
| |
Commit-ID: 372e22ef0a87d5fc10d387791f9f19721115820c Gitweb: http://git.kernel.org/tip/372e22ef0a87d5fc10d387791f9f19721115820c Author: Randy Dunlap <randy.dunlap@oracle.com> AuthorDate: Mon, 1 Mar 2010 22:06:25 -0800 Committer: H. Peter Anvin <hpa@zytor.com> CommitDate: Mon, 1 Mar 2010 23:14:33 -0800
x86, docbook: Fix errors from x86 headers merger
Fix docbook errors for x86 headers that were recently merged:
docproc: arch/x86/include/asm/atomic_32.h: No such file or directory docproc: arch/x86/include/asm/io_32.h: No such file or directory
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> LKML-Reference: <20100301220625.bad46c19.randy.dunlap@oracle.com> Cc: Brian Gerst <brgerst@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com> --- Documentation/DocBook/device-drivers.tmpl | 2 +- Documentation/DocBook/deviceiobook.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index f9a6e2c..1b2dd4f 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -45,7 +45,7 @@ </sect1> <sect1><title>Atomic and pointer manipulation</title> -!Iarch/x86/include/asm/atomic_32.h +!Iarch/x86/include/asm/atomic.h !Iarch/x86/include/asm/unaligned.h </sect1> diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl index 3ed8812..c1ed6a4 100644 --- a/Documentation/DocBook/deviceiobook.tmpl +++ b/Documentation/DocBook/deviceiobook.tmpl @@ -316,7 +316,7 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) <chapter id="pubfunctions"> <title>Public Functions Provided</title> -!Iarch/x86/include/asm/io_32.h +!Iarch/x86/include/asm/io.h !Elib/iomap.c </chapter>
| |