diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:04:11 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 11:04:11 +0200 |
| commit | 32457942b90aabb9242b450f02d18d9c8d982916 (patch) | |
| tree | 6472b77016f83f2ada7a7e2ca83a9803f313f1a8 /drivers/serial/Kconfig | |
| parent | ARM: Merge for-2635/s5pv210-clock (diff) | |
| parent | ARM: SMDK2416: Add support for framebuffer device and ensure correct setup (diff) | |
| download | linux-32457942b90aabb9242b450f02d18d9c8d982916.tar.xz linux-32457942b90aabb9242b450f02d18d9c8d982916.zip | |
ARM: Merge for-2635/fb-updates1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index f55c49475a8c..5f3f03df92e3 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -518,12 +518,13 @@ config SERIAL_S3C2412 Serial port support for the Samsung S3C2412 and S3C2413 SoC config SERIAL_S3C2440 - tristate "Samsung S3C2440/S3C2442 Serial port support" - depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442) + tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support" + depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416) default y if CPU_S3C2440 default y if CPU_S3C2442 + select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416 help - Serial port support for the Samsung S3C2440 and S3C2442 SoC + Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC config SERIAL_S3C24A0 tristate "Samsung S3C24A0 Serial port support" |