summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorKukjin Kim2011-03-11 03:05:46 +0100
committerKukjin Kim2011-03-11 03:05:46 +0100
commitf4612798a1ca33e4c9b5b9152f4b9b3b23a2da58 (patch)
tree852f617cf2d5329f6c0511190806516e026a56d8 /drivers/tty
parentLinux 2.6.38-rc8 (diff)
parentARM: EXYNOS4: Implement kernel timers using MCT (diff)
downloadkernel-qcow2-linux-f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58.tar.gz
kernel-qcow2-linux-f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58.tar.xz
kernel-qcow2-linux-f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58.zip
Merge branch 'next-exynos4' into for-next
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2b8334601c8b..8f144d029a4b 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