]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
docbook: fix errors from x86 headers merger
authorRandy Dunlap <randy.dunlap@oracle.com>
Tue, 2 Mar 2010 06:06:25 +0000 (22:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Mar 2010 15:32:39 +0000 (07:32 -0800)
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>
Cc: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Documentation/DocBook/device-drivers.tmpl
Documentation/DocBook/deviceiobook.tmpl

index f9a6e2c75f128da4d57dcd331434731d804fbacb..1b2dd4fc3db24b57db4178d92fe2b9828c27b9ff 100644 (file)
@@ -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>
 
index 3ed88126ab8f8f360dac4d10933e8202ba3469e5..c1ed6a49e598cd992552fa6e3b0da70f59aa7829 100644 (file)
@@ -316,7 +316,7 @@ CPU B:  spin_unlock_irqrestore(&amp;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>