diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 20:49:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-18 20:49:42 -0400 |
| commit | 6a13a857becef065cd138b67c162dc5c5dd88655 (patch) | |
| tree | ad109960ad4fde202a50ead1b543168bbaaa86b9 /Documentation/s390/CommonIO | |
| parent | 3bee9df0ab55add6f8df92267a8a3d9d339cce08 (diff) | |
| parent | ce9b18f5cdd628196ca13bb783e8dcd5ad29ceaa (diff) | |
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/CommonIO | 2 |
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 | |||
| 66 | 66 | ||
| 67 | When a device is un-ignored, device recognition and sensing is performed and | 67 | When a device is un-ignored, device recognition and sensing is performed and |
| 68 | the device driver will be notified if possible, so the device will become | 68 | the device driver will be notified if possible, so the device will become |
| 69 | available to the system. | 69 | available to the system. Note that un-ignoring is performed asynchronously. |
| 70 | 70 | ||
| 71 | You can also add ranges of devices to be ignored by piping to | 71 | You can also add ranges of devices to be ignored by piping to |
| 72 | /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the | 72 | /proc/cio_ignore; "add <device range>, <device range>, ..." will ignore the |