diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:07:19 -0400 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /drivers/serial/Kconfig | |
| parent | 500b9fc922cbec572f4fd1436533bfaed5011262 (diff) | |
| parent | a68fefe0d2f364ac3d8497ef37dcad713c261103 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/serial/Kconfig')
| -rw-r--r-- | drivers/serial/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index e437ce8c1748..8f23eb54f498 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -536,8 +536,8 @@ config SERIAL_S3C6400 | |||
| 536 | 536 | ||
| 537 | config SERIAL_S5PV210 | 537 | config SERIAL_S5PV210 |
| 538 | tristate "Samsung S5PV210 Serial port support" | 538 | tristate "Samsung S5PV210 Serial port support" |
| 539 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442) | 539 | depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_S5P6442 || CPU_S5PV310) |
| 540 | select SERIAL_SAMSUNG_UARTS_4 if CPU_S5PV210 | 540 | select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_S5PV310) |
| 541 | default y | 541 | default y |
| 542 | help | 542 | help |
| 543 | Serial port support for Samsung's S5P Family of SoC's | 543 | Serial port support for Samsung's S5P Family of SoC's |