Skip to contentSkip to conversation

x86/doc change for v2.6.35

GIT PULL Ingo Molnar 1 participant 1 message May 17, 2010 Documentation

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-doc-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-doc-for-linus

Thanks,

Ingo

------------------>
Randy Dunlap (1):
x86, docbook: Fix errors from x86 headers merger

 Documentation/DocBook/device-drivers.tmpl |    2 +-
 Documentation/DocBook/deviceiobook.tmpl   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Documentation/DocBook/device-drivers.tmpl +1 -1
index f9a6e2c..1b2dd4f 100644
@@ -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>
 
Documentation/DocBook/deviceiobook.tmpl +1 -1
index 3ed8812..c1ed6a4 100644
@@ -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>