diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 08:49:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 08:49:25 +0100 |
| commit | a3685f00652af83f12b63e3b4ef48f29581ba48b (patch) | |
| tree | 18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /drivers | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | ARM: SAMSUNG: Update S3C2416 entry with S3C2450 (diff) | |
| download | linux-dev-a3685f00652af83f12b63e3b4ef48f29581ba48b.tar.xz linux-dev-a3685f00652af83f12b63e3b4ef48f29581ba48b.zip | |
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'drivers')
| -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" |