aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/s390/CommonIO
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:49:42 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-18 17:49:42 -0700
commit6a13a857becef065cd138b67c162dc5c5dd88655 (patch)
treead109960ad4fde202a50ead1b543168bbaaa86b9 /Documentation/s390/CommonIO
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff)
parent[S390] update default configuration (diff)
downloadlinux-dev-6a13a857becef065cd138b67c162dc5c5dd88655.tar.xz
linux-dev-6a13a857becef065cd138b67c162dc5c5dd88655.zip
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] update default configuration [S390] cio: update documentation. [S390] dasd: clean up timer. [S390] Fix pte type checking. [S390] monwriter find header logic. [S390] cio: sch_no -> schid.sch_no conversion. [S390] Wire up epoll_pwait syscall. [S390] cio: invalid device operational notification [S390] fix vmlinux link when CONFIG_SYSIPC=n
Diffstat (limited to 'Documentation/s390/CommonIO')
-rw-r--r--Documentation/s390/CommonIO2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/s390/CommonIO b/Documentation/s390/CommonIO
index 59d1166d41ee..d684a6ac69a8 100644
--- 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
- 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