projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a443a63)
drivers: serial: S5PC100 serial driver cleanup
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 18 May 2010 10:38:39 +0000 (12:38 +0200)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:22:55 +0000 (18:22 +0900)
Remove unnecessary Kconfig entry. S5PC100 has exactly the same driver as
S3C6400/S3C6410/S5P6440.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
drivers/serial/Kconfig patch | blob | blame | history
drivers/serial/Makefile patch | blob | blame | history

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5f3f03df92e3613a1bb4658e57d6cb3fa9b4f30b..302836a8069304424bda675515498b38f2b32f23 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -534,21 +534,13 @@ config SERIAL_S3C24A0
          Serial port support for the Samsung S3C24A0 SoC
 
 config SERIAL_S3C6400
-       tristate "Samsung S3C6400/S3C6410/S5P6440 Seria port support"
-       depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440)
+       tristate "Samsung S3C6400/S3C6410/S5P6440/S5PC100 Serial port support"
+       depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5PC100)
        select SERIAL_SAMSUNG_UARTS_4
        default y
        help
-         Serial port support for the Samsung S3C6400, S3C6410 and S5P6440
-         SoCs
-
-config SERIAL_S5PC100
-       tristate "Samsung S5PC100 Serial port support"
-       depends on SERIAL_SAMSUNG && CPU_S5PC100
-       select SERIAL_SAMSUNG_UARTS_4
-       default y
-       help
-         Serial port support for the Samsung S5PC100 SoCs
+         Serial port support for the Samsung S3C6400, S3C6410, S5P6440
+         and S5PC100 SoCs
 
 config SERIAL_S5PV210
        tristate "Samsung S5PV210 Serial port support"
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 6aa4723b74eecd58743e06e996fce958f551741d..328f107346c4f6c19254f855c7515a409ce7a091 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -44,7 +44,6 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
 obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
 obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
 obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
-obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o
 obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o