diff options
author | Greg Kroah-Hartman | 2013-07-29 12:32:30 -0700 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-07-29 12:32:30 -0700 |
commit | cf204a1b54a5fa34d64676313a1cb0119657388d (patch) | |
tree | e0c86bb9fda1b308cf473b3909a36d34a2aab385 /drivers/tty/serial/Kconfig | |
parent | 299a62575a63b19add8206642b340f1b54ec4faf (diff) | |
parent | 5ae90d8e467e625e447000cb4335c4db973b1095 (diff) |
Merge 3.11-rc3 into tty-next
We want the tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/Kconfig')
-rw-r--r-- | drivers/tty/serial/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index bdf5c0e44b68..f13624807d12 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -277,7 +277,7 @@ config SERIAL_TEGRA select SERIAL_CORE help Support for the on-chip UARTs on the NVIDIA Tegra series SOCs - providing /dev/ttyHS0, 1, 2, 3 and 4 (note, some machines may not + providing /dev/ttyTHS0, 1, 2, 3 and 4 (note, some machines may not provide all of these ports, depending on how the serial port are enabled). This driver uses the APB DMA to achieve higher baudrate and better performance. |