diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 13:42:10 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 13:42:10 +0300 |
commit | 5131dcd7810806fe4ff81ca23dadb47921285e36 (patch) | |
tree | e3fb4dd65c6807fae3a5215cf1310eafecdeb86f /drivers/tty/serial/Kconfig | |
parent | 463e2a2b8996aabc0dca67cc716a00e30bffc110 (diff) | |
parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
download | linux-5131dcd7810806fe4ff81ca23dadb47921285e36.tar.xz |
Merge 4.9-rc3 into tty-next
We want the serial/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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f9c595ca2832..5a7c9d03f8cf 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1638,6 +1638,7 @@ config SERIAL_SPRD_CONSOLE config SERIAL_STM32 tristate "STMicroelectronics STM32 serial port support" select SERIAL_CORE + depends on HAS_DMA depends on ARM || COMPILE_TEST help This driver is for the on-chip Serial Controller on |