Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / Documentation / s390 / CommonIO

diff --git a/Documentation/s390/CommonIO b/Documentation/s390/CommonIO
index 59d1166d41eeebc095528a84a24fa584ea0c953d..22f82f21bc605395b4fa34d7a85cc8ad63bd2e07 100644 (file)
--- a/Documentation/s390/CommonIO
+++ b/Documentation/s390/CommonIO
@@ -66,7 +66,7 @@ Command line parameters
 
   When a device is un-ignored, device recognition and sensing is performed and 
   the device driver will be notified if possible, so the device will become
 
   When a device is un-ignored, device recognition and sensing is performed and 
   the device driver will be notified if possible, so the device will become

-  available to the system.
+  available to the system. Note that un-ignoring is performed asynchronously.

 
   You can also add ranges of devices to be ignored by piping to 
   /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the
 
   You can also add ranges of devices to be ignored by piping to 
   /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the


@@ -74,7 +74,7 @@ Command line parameters
 
   Note: While already known devices can be added to the list of devices to be
         ignored, there will be no effect on then. However, if such a device
 
   Note: While already known devices can be added to the list of devices to be
         ignored, there will be no effect on then. However, if such a device

-        disappears and then reappeares, it will then be ignored.
+       disappears and then reappears, it will then be ignored.

 
   For example,
        "echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"
 
   For example,
        "echo add 0.0.a000-0.0.accc, 0.0.af00-0.0.afff > /proc/cio_ignore"


@@ -82,7 +82,7 @@ Command line parameters
   devices.
 
   The devices can be specified either by bus id (0.0.abcd) or, for 2.4 backward
   devices.
 
   The devices can be specified either by bus id (0.0.abcd) or, for 2.4 backward

-  compatibilty, by the device number in hexadecimal (0xabcd or abcd).
+  compatibility, by the device number in hexadecimal (0xabcd or abcd).

 
 
 * /proc/s390dbf/cio_*/ (S/390 debug feature)
 
 
 * /proc/s390dbf/cio_*/ (S/390 debug feature)