diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
| commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
| tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /drivers/tty | |
| parent | Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: EXYNOS4: Implement Clock gating for System MMU (diff) | |
| download | linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.xz linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
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 5c4b3475621f..aa9d3d11031d 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 |