Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[firefly-linux-kernel-4.4.55.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index cc4c8682b47b6a8324d0944f9f4010b3711be025..febd45cd50273532e99c1a4d790d2690c6ae750d 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -5,7 +5,7 @@
 if TTY
 
 menu "Serial drivers"
-       depends on HAS_IOMEM && GENERIC_HARDIRQS
+       depends on HAS_IOMEM
 
 source "drivers/tty/serial/8250/Kconfig"
 
@@ -1439,6 +1439,15 @@ config SERIAL_EFM32_UART_CONSOLE
        depends on SERIAL_EFM32_UART=y
        select SERIAL_CORE_CONSOLE
 
+config SERIAL_TILEGX
+       tristate "TILE-Gx on-chip serial port support"
+       depends on TILEGX
+       select TILE_GXIO_UART
+       select SERIAL_CORE
+       ---help---
+         This device provides access to the on-chip UARTs on the TILE-Gx
+         processor.
+
 config SERIAL_ARC
        tristate "ARC UART driver support"
        select SERIAL_CORE