1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index e461be164f67..e1aee37270f5 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -537,8 +537,8 @@ config SERIAL_S3C6400
 
 config SERIAL_S5PV210
         tristate "Samsung S5PV210 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310)
-        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310)
+        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_EXYNOS4210)
+        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210)
         default y
         help
           Serial port support for Samsung's S5P Family of SoC's
@@ -1598,4 +1598,18 @@ config SERIAL_MSM_SMD
           Enables userspace clients to read and write to some streaming SMD
           ports via tty device interface for MSM chipset.
 
+config SERIAL_MXS_AUART
+        depends on ARCH_MXS
+        tristate "MXS AUART support"
+        select SERIAL_CORE
+        help
+          This driver supports the MXS Application UART (AUART) port.
+
+config SERIAL_MXS_AUART_CONSOLE
+        bool "MXS AUART console support"
+        depends on SERIAL_MXS_AUART=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Enable a MXS AUART port to be the system console.
+
 endmenu