diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2010-05-18 06:38:39 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:22:55 -0400 |
| commit | cb34a67472c3171f350e45bc66eebf480acec792 (patch) | |
| tree | 1639665d5bb6cb062491c954d12f810988fa1180 /drivers/serial | |
| parent | a443a6373d8527657cfde3d3c515d4a64532c585 (diff) | |
drivers: serial: S5PC100 serial driver cleanup
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>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 5f3f03df92e3..302836a80693 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -534,21 +534,13 @@ config SERIAL_S3C24A0 | |||
| 534 | Serial port support for the Samsung S3C24A0 SoC | 534 | Serial port support for the Samsung S3C24A0 SoC |
| 535 | 535 | ||
| 536 | config SERIAL_S3C6400 | 536 | config SERIAL_S3C6400 |
| 537 | tristate "Samsung S3C6400/S3C6410/S5P6440 Seria port support" | 537 | tristate "Samsung S3C6400/S3C6410/S5P6440/S5PC100 Serial port support" |
| 538 | depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440) | 538 | depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5PC100) |
| 539 | select SERIAL_SAMSUNG_UARTS_4 | 539 | select SERIAL_SAMSUNG_UARTS_4 |
| 540 | default y | 540 | default y |
| 541 | help | 541 | help |
| 542 | Serial port support for the Samsung S3C6400, S3C6410 and S5P6440 | 542 | Serial port support for the Samsung S3C6400, S3C6410, S5P6440 |
| 543 | SoCs | 543 | and S5PC100 SoCs |
| 544 | |||
| 545 | config SERIAL_S5PC100 | ||
| 546 | tristate "Samsung S5PC100 Serial port support" | ||
| 547 | depends on SERIAL_SAMSUNG && CPU_S5PC100 | ||
| 548 | select SERIAL_SAMSUNG_UARTS_4 | ||
| 549 | default y | ||
| 550 | help | ||
| 551 | Serial port support for the Samsung S5PC100 SoCs | ||
| 552 | 544 | ||
| 553 | config SERIAL_S5PV210 | 545 | config SERIAL_S5PV210 |
| 554 | tristate "Samsung S5PV210 Serial port support" | 546 | tristate "Samsung S5PV210 Serial port support" |
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 6aa4723b74ee..328f107346c4 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
| @@ -44,7 +44,6 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o | |||
| 44 | obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o | 44 | obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o |
| 45 | obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o | 45 | obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o |
| 46 | obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o | 46 | obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o |
| 47 | obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o | ||
| 48 | obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o | 47 | obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o |
| 49 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o | 48 | obj-$(CONFIG_SERIAL_MAX3100) += max3100.o |
| 50 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o | 49 | obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o |