aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-23 10:39:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-23 10:39:50 -0800
commite0f13bd46ac4faa26a34fc33b457013d5b8a96f5 (patch)
tree6d2f9b96d9842540a551ab2a05baf8045f774176 /Documentation
parentb9c2b05022152ccec9a0c5987739a3e891e7d621 (diff)
parent5c0a2450d695bbe32b1fb81c07751bcbea64f084 (diff)
downloadlinux-e0f13bd46ac4faa26a34fc33b457013d5b8a96f5.tar.gz
Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY revert from Greg KH: "Here is a single commit, a revert of a sysfs file change that ended up breaking a userspace tool" * tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: Revert "tty: Set correct tty name in 'active' sysfs attribute"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ABI/testing/sysfs-tty3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-tty b/Documentation/ABI/testing/sysfs-tty
index a2ccec35ffce..ad22fb0ee765 100644
--- a/Documentation/ABI/testing/sysfs-tty
+++ b/Documentation/ABI/testing/sysfs-tty
@@ -3,8 +3,7 @@ Date: Nov 2010
Contact: Kay Sievers <kay.sievers@vrfy.org>
Description:
Shows the list of currently configured
- tty devices used for the console,
- like 'tty1 ttyS0'.
+ console devices, like 'tty1 ttyS0'.
The last entry in the file is the active
device connected to /dev/console.
The file supports poll() to detect virtual