diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-10 21:05:46 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-10 21:05:46 -0500 |
| commit | f4612798a1ca33e4c9b5b9152f4b9b3b23a2da58 (patch) | |
| tree | 852f617cf2d5329f6c0511190806516e026a56d8 /drivers/tty | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
| parent | 30d8bead5a309492d1dae2f6511a0465fe6ad05e (diff) | |
Merge branch 'next-exynos4' into 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 2b8334601c8b..8f144d029a4b 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
| @@ -537,8 +537,8 @@ config SERIAL_S3C6400 | |||
| 537 | 537 | ||
| 538 | config SERIAL_S5PV210 | 538 | config SERIAL_S5PV210 |
| 539 | tristate "Samsung S5PV210 Serial port support" | 539 | tristate "Samsung S5PV210 Serial port support" |
| 540 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310) | 540 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_EXYNOS4210) |
| 541 | select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310) | 541 | select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210) |
| 542 | default y | 542 | default y |
| 543 | help | 543 | help |
| 544 | Serial port support for Samsung's S5P Family of SoC's | 544 | Serial port support for Samsung's S5P Family of SoC's |