diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-30 13:35:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-30 13:35:33 +0100 |
| commit | 473edeccacc7618d16cfe90173d582b41849d1bf (patch) | |
| tree | d7508722f3dde1fe9194cb789a82cacfdf1d4e55 /Documentation/admin-guide | |
| parent | 367f86da6701ad221174879dc5e4f308c334122d (diff) | |
| parent | bf961847813d9edcb5a9c089714069428d141fa9 (diff) | |
| download | linux-next-473edeccacc7618d16cfe90173d582b41849d1bf.tar.gz linux-next-473edeccacc7618d16cfe90173d582b41849d1bf.zip | |
Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
# Conflicts:
# drivers/tty/serial/qcom_geni_serial.c
# include/linux/soc/qcom/geni-se.h
Diffstat (limited to 'Documentation/admin-guide')
| -rw-r--r-- | Documentation/admin-guide/devices.txt | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index f544399675fa..855f2cad0535 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -2388,18 +2388,9 @@ 171 char Reserved for IEEE 1394 (Firewire) - 172 char Moxa Intellio serial card - 0 = /dev/ttyMX0 First Moxa port - 1 = /dev/ttyMX1 Second Moxa port - ... - 127 = /dev/ttyMX127 128th Moxa port - 128 = /dev/moxactl Moxa control port + 172 char - 173 char Moxa Intellio serial card - alternate devices - 0 = /dev/cumx0 Callout device for ttyMX0 - 1 = /dev/cumx1 Callout device for ttyMX1 - ... - 127 = /dev/cumx127 Callout device for ttyMX127 + 173 char 174 char SmartIO serial card 0 = /dev/ttySI0 First SmartIO port |