diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 13:39:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 13:39:50 -0500 |
| commit | e0f13bd46ac4faa26a34fc33b457013d5b8a96f5 (patch) | |
| tree | 6d2f9b96d9842540a551ab2a05baf8045f774176 /Documentation | |
| parent | b9c2b05022152ccec9a0c5987739a3e891e7d621 (diff) | |
| parent | 5c0a2450d695bbe32b1fb81c07751bcbea64f084 (diff) | |
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-tty | 3 |
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 | |||
| 3 | Contact: Kay Sievers <kay.sievers@vrfy.org> | 3 | Contact: Kay Sievers <kay.sievers@vrfy.org> |
| 4 | Description: | 4 | Description: |
| 5 | Shows the list of currently configured | 5 | Shows the list of currently configured |
| 6 | tty devices used for the console, | 6 | console devices, like 'tty1 ttyS0'. |
| 7 | like 'tty1 ttyS0'. | ||
| 8 | The last entry in the file is the active | 7 | The last entry in the file is the active |
| 9 | device connected to /dev/console. | 8 | device connected to /dev/console. |
| 10 | The file supports poll() to detect virtual | 9 | The file supports poll() to detect virtual |