---

yaml
---
r: 83647
b: refs/heads/master
c: 57f78ab
h: refs/heads/master
i:
  83645: b5c0b8f
  83643: e58103f
  83639: 7cc126a
  83631: 4b948ec
  83615: 53b23f9
  83583: 255167b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c1ca6e68a5d8d58776833b6496c0656a10be50c
+refs/heads/master: 57f78ab3b0e9338a9241aeff6ee92aecc8f8bcbb

trunk/Documentation/DocBook/s390-drivers.tmpl

@@ -59,7 +59,7 @@
    <title>Introduction</title>
   <para>
     This document describes the interfaces available for device drivers that
-    drive s390 based channel attached I/O devices. This includes interfaces for
+    drive s390 based channel attached devices. This includes interfaces for
     interaction with the hardware and interfaces for interacting with the
     common driver core. Those interfaces are provided by the s390 common I/O
     layer.
@@ -86,10 +86,9 @@
 	The ccw bus typically contains the majority of devices available to
 	a s390 system. Named after the channel command word (ccw), the basic
 	command structure used to address its devices, the ccw bus contains
-	so-called channel attached devices. They are addressed via I/O
-	subchannels, visible on the css bus. A device driver for
-	channel-attached devices, however, will never interact	with the
-	subchannel directly, but only via the I/O device on the ccw bus,
+	so-called channel attached devices. They are addressed via subchannels,
+	visible on the css bus. A device driver, however, will never interact
+	with the subchannel directly, but only via the device on the ccw bus,
 	the ccw device.
   </para>
     <sect1 id="channelIO">
@@ -117,6 +116,7 @@
 !Iinclude/asm-s390/ccwdev.h
 !Edrivers/s390/cio/device.c
 !Edrivers/s390/cio/device_ops.c
+!Edrivers/s390/cio/airq.c
     </sect1>
     <sect1 id="cmf">
      <title>The channel-measurement facility</title>
@@ -147,15 +147,4 @@
    </sect1>
   </chapter>
 
-  <chapter id="genericinterfaces">
-   <title>Generic interfaces</title>
-  <para>
-	Some interfaces are available to other drivers that do not necessarily
-	have anything to do with the busses described above, but still are
-	indirectly using basic infrastructure in the common I/O layer.
-	One example is the support for adapter interrupts.
-  </para>
-!Edrivers/s390/cio/airq.c
-  </chapter>
-
 </book>