diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 03:49:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 03:49:25 -0400 |
| commit | a3685f00652af83f12b63e3b4ef48f29581ba48b (patch) | |
| tree | 18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /drivers | |
| parent | b12f3cbd7a9a869eae1eb108da02526b132ba80b (diff) | |
| parent | 63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (diff) | |
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 | |||
| 518 | Serial port support for the Samsung S3C2412 and S3C2413 SoC | 518 | Serial port support for the Samsung S3C2412 and S3C2413 SoC |
| 519 | 519 | ||
| 520 | config SERIAL_S3C2440 | 520 | config SERIAL_S3C2440 |
| 521 | tristate "Samsung S3C2440/S3C2442 Serial port support" | 521 | tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support" |
| 522 | depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442) | 522 | depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416) |
| 523 | default y if CPU_S3C2440 | 523 | default y if CPU_S3C2440 |
| 524 | default y if CPU_S3C2442 | 524 | default y if CPU_S3C2442 |
| 525 | select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416 | ||
| 525 | help | 526 | help |
| 526 | Serial port support for the Samsung S3C2440 and S3C2442 SoC | 527 | Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC |
| 527 | 528 | ||
| 528 | config SERIAL_S3C24A0 | 529 | config SERIAL_S3C24A0 |
| 529 | tristate "Samsung S3C24A0 Serial port support" | 530 | tristate "Samsung S3C24A0 Serial port support" |