Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index ce9b12d..2e6d8dd 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -289,7 +289,7 @@ config SERIAL_MAX3100
          MAX3100 chip support
 
 config SERIAL_MAX310X
-       bool "MAX310X support"
+       tristate "MAX310X support"
        depends on SPI_MASTER
        select SERIAL_CORE
        select REGMAP_SPI if SPI_MASTER
@@ -708,7 +708,7 @@ config SERIAL_IP22_ZILOG_CONSOLE
 
 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
-       depends on HAVE_CLK && (SUPERH || ARM || COMPILE_TEST)
+       depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
        select SERIAL_CORE
 
 config SERIAL_SH_SCI_NR_UARTS