diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:39:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:39:20 -0500 |
commit | 56b85f32d530d09d6805488ad00775d4e0e3baab (patch) | |
tree | e7fbe69e338ef775d3b2dd822aa915d259b4bc94 /Documentation/ABI | |
parent | 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 (diff) | |
parent | 568389c257fa7d74ce36c2f78bad31965fded4cf (diff) |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
serial: apbuart: Fixup apbuart_console_init()
TTY: Add tty ioctl to figure device node of the system console.
tty: add 'active' sysfs attribute to tty0 and console device
drivers: serial: apbuart: Handle OF failures gracefully
Serial: Avoid unbalanced IRQ wake disable during resume
tty: fix typos/errors in tty_driver.h comments
pch_uart : fix warnings for 64bit compile
8250: fix uninitialized FIFOs
ip2: fix compiler warning on ip2main_pci_tbl
specialix: fix compiler warning on specialix_pci_tbl
rocket: fix compiler warning on rocket_pci_ids
8250: add a UPIO_DWAPB32 for 32 bit accesses
8250: use container_of() instead of casting
serial: omap-serial: Add support for kernel debugger
serial: fix pch_uart kconfig & build
drivers: char: hvc: add arm JTAG DCC console support
RS485 documentation: add 16C950 UART description
serial: ifx6x60: fix memory leak
serial: ifx6x60: free IRQ on error
Serial: EG20T: add PCH_UART driver
...
Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
Diffstat (limited to 'Documentation/ABI')
-rw-r--r-- | Documentation/ABI/testing/sysfs-tty | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-tty b/Documentation/ABI/testing/sysfs-tty new file mode 100644 index 00000000000..b138b663bf5 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-tty | |||
@@ -0,0 +1,19 @@ | |||
1 | What: /sys/class/tty/console/active | ||
2 | Date: Nov 2010 | ||
3 | Contact: Kay Sievers <kay.sievers@vrfy.org> | ||
4 | Description: | ||
5 | Shows the list of currently configured | ||
6 | console devices, like 'tty1 ttyS0'. | ||
7 | The last entry in the file is the active | ||
8 | device connected to /dev/console. | ||
9 | The file supports poll() to detect virtual | ||
10 | console switches. | ||
11 | |||
12 | What: /sys/class/tty/tty0/active | ||
13 | Date: Nov 2010 | ||
14 | Contact: Kay Sievers <kay.sievers@vrfy.org> | ||
15 | Description: | ||
16 | Shows the currently active virtual console | ||
17 | device, like 'tty1'. | ||
18 | The file supports poll() to detect virtual | ||
19 | console switches. | ||