Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[safe/jmp/linux-2.6] / Documentation / DocBook / deviceiobook.tmpl

diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl
index 6f41f2f..3ed8812 100644 (file)
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
@@ -24,7 +24,7 @@
     <surname>Cox</surname>
     <affiliation>
      <address>
-      <email>alan@redhat.com</email>
+      <email>alan@lxorguk.ukuu.org.uk</email>
      </address>
     </affiliation>
    </author>
@@ -85,7 +85,7 @@
 
   <chapter id="mmio">
     <title>Memory Mapped IO</title>
-    <sect1>
+    <sect1 id="getting_access_to_the_device">
       <title>Getting Access to the Device</title>
       <para>
        The most widely supported form of IO is memory mapped IO.
@@ -114,7 +114,7 @@
       </para>
     </sect1>
 
-    <sect1>
+    <sect1 id="accessing_the_device">
       <title>Accessing the device</title>
       <para>
        The part of the interface most used by drivers is reading and
@@ -270,30 +270,11 @@ CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)
       </para>
     </sect1>
 
-    <sect1>
-      <title>ISA legacy functions</title>
-      <para>
-       On older kernels (2.2 and earlier) the ISA bus could be read or
-       written with these functions and without ioremap being used. This is
-       no longer true in Linux 2.4. A set of equivalent functions exist for
-       easy legacy driver porting. The functions available are prefixed
-       with 'isa_' and are <function>isa_readb</function>,
-       <function>isa_writeb</function>, <function>isa_readw</function>, 
-       <function>isa_writew</function>, <function>isa_readl</function>,
-       <function>isa_writel</function>, <function>isa_memcpy_fromio</function>
-       and <function>isa_memcpy_toio</function>
-      </para>
-      <para>
-       These functions should not be used in new drivers, and will
-       eventually be going away.
-      </para>
-    </sect1>
-
   </chapter>
 
-  <chapter>
+  <chapter id="port_space_accesses">
     <title>Port Space Accesses</title>
-    <sect1>
+    <sect1 id="port_space_explained">
       <title>Port Space Explained</title>
 
       <para>
@@ -310,7 +291,7 @@ CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)
       </para>
 
     </sect1>
-    <sect1>
+    <sect1 id="accessing_port_space">
       <title>Accessing Port Space</title>
       <para>
        Accesses to this space are provided through a set of functions
@@ -335,7 +316,8 @@ CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)
 
   <chapter id="pubfunctions">
      <title>Public Functions Provided</title>
-!Einclude/asm-i386/io.h
+!Iarch/x86/include/asm/io_32.h
+!Elib/iomap.c
   </chapter>
 
 </book>