Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable

[net-next-2.6.git] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 406ad918cbac4903ff98d96b91d6fd333934b48d..df62f4ea4f691c9c52fda0a71454eabdda6b283d 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -459,7 +459,7 @@ config SERIAL_SAMSUNG_UARTS
        int
        depends on ARM && PLAT_S3C
        default 2 if ARCH_S3C2400
-       default 4 if ARCH_S5PC1XX || ARCH_S3C64XX || CPU_S3C2443
+       default 4 if ARCH_S5P6440 || ARCH_S5PC1XX || ARCH_S5PV210 || ARCH_S3C64XX || CPU_S3C2443
        default 3
        help
          Select the number of available UART ports for the Samsung S3C
@@ -526,11 +526,11 @@ config SERIAL_S3C24A0
          Serial port support for the Samsung S3C24A0 SoC
 
 config SERIAL_S3C6400
-       tristate "Samsung S3C6400/S3C6410 Serial port support"
-       depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410)
+       tristate "Samsung S3C6400/S3C6410/S5P6440 Serial port support"
+       depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440)
        default y
        help
-         Serial port support for the Samsung S3C6400 and S3C6410
+         Serial port support for the Samsung S3C6400, S3C6410 and S5P6440
          SoCs
 
 config SERIAL_S5PC100
@@ -540,6 +540,13 @@ config SERIAL_S5PC100
        help
          Serial port support for the Samsung S5PC100 SoCs
 
+config SERIAL_S5PV210
+       tristate "Samsung S5PV210 Serial port support"
+       depends on SERIAL_SAMSUNG && CPU_S5PV210
+       default y
+       help
+         Serial port support for Samsung's S5P Family of SoC's
+
 config SERIAL_MAX3100
        tristate "MAX3100 support"
        depends on SPI