diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:52:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:52:51 +1100 |
| commit | c52ab543028bc138723b97d63ca9d8c364b38086 (patch) | |
| tree | 0a3832f1f5bb33e66823d90a22863bf5a5358a5d /drivers/tty | |
| parent | 06c24a773d061180dfea3341692a36c1abd2757a (diff) | |
| parent | 357d17723e59105f48f007b1bb364700a996cd45 (diff) | |
Merge remote-tracking branch 's5p/for-next'
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index ef164f58120f..532cdd6fa6fc 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 |