From 5cab91ef16f8a348b7127674c4e51d8f9c3a30bc Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Wed, 7 Nov 2007 04:09:46 -0500 Subject: [PATCH] --- yaml --- r: 75701 b: refs/heads/master c: b1c7192df1b089ed654c76fbf14d7f7dbf4b9616 h: refs/heads/master i: 75699: 6ccbf9979a94d09af037c6aa435373634030b9d6 v: v3 --- [refs] | 2 +- trunk/Documentation/pnp.txt | 4 ++-- trunk/Documentation/s390/cds.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 154dda4c4cc1..fd228f6d94ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20fd1e3bea554620d489f3542496639c1babe0b3 +refs/heads/master: b1c7192df1b089ed654c76fbf14d7f7dbf4b9616 diff --git a/trunk/Documentation/pnp.txt b/trunk/Documentation/pnp.txt index 481faf515d53..a327db67782a 100644 --- a/trunk/Documentation/pnp.txt +++ b/trunk/Documentation/pnp.txt @@ -17,9 +17,9 @@ The User Interface ------------------ The Linux Plug and Play user interface provides a means to activate PnP devices for legacy and user level drivers that do not support Linux Plug and Play. The -user interface is integrated into driverfs. +user interface is integrated into sysfs. -In addition to the standard driverfs file the following are created in each +In addition to the standard sysfs file the following are created in each device's directory: id - displays a list of support EISA IDs options - displays possible resource configurations diff --git a/trunk/Documentation/s390/cds.txt b/trunk/Documentation/s390/cds.txt index 3081927cc2d6..c4b7b2bd369a 100644 --- a/trunk/Documentation/s390/cds.txt +++ b/trunk/Documentation/s390/cds.txt @@ -133,7 +133,7 @@ During its startup the Linux/390 system checks for peripheral devices. Each of those devices is uniquely defined by a so called subchannel by the ESA/390 channel subsystem. While the subchannel numbers are system generated, each subchannel also takes a user defined attribute, the so called device number. -Both subchannel number and device number cannot exceed 65535. During driverfs +Both subchannel number and device number cannot exceed 65535. During sysfs initialisation, the information about control unit type and device types that imply specific I/O commands (channel command words - CCWs) in order to operate the device are gathered. Device drivers can retrieve this set of hardware