Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos

1 files changed, 0 insertions, 28 deletions

diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 1e52b6926374..04284de7aca5 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -28,7 +28,6 @@ config CPU_S3C2410
         bool "SAMSUNG S3C2410"
         default y
         select CPU_ARM920T
-        select CPU_LLSERIAL_S3C2410
         select S3C2410_COMMON_CLK
         select S3C2410_DMA if S3C24XX_DMA
         select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
@@ -41,7 +40,6 @@ config CPU_S3C2410
 config CPU_S3C2412
         bool "SAMSUNG S3C2412"
         select CPU_ARM926T
-        select CPU_LLSERIAL_S3C2440
         select S3C2412_COMMON_CLK
         select S3C2412_DMA if S3C24XX_DMA
         select S3C2412_PM if PM
@@ -51,7 +49,6 @@ config CPU_S3C2412
 config CPU_S3C2416
         bool "SAMSUNG S3C2416/S3C2450"
         select CPU_ARM926T
-        select CPU_LLSERIAL_S3C2440
         select S3C2416_PM if PM
         select S3C2443_COMMON_CLK
         select S3C2443_DMA if S3C24XX_DMA
@@ -61,7 +58,6 @@ config CPU_S3C2416
 config CPU_S3C2440
         bool "SAMSUNG S3C2440"
         select CPU_ARM920T
-        select CPU_LLSERIAL_S3C2440
         select S3C2410_COMMON_CLK
         select S3C2410_PM if PM
         select S3C2440_DMA if S3C24XX_DMA
@@ -71,7 +67,6 @@ config CPU_S3C2440
 config CPU_S3C2442
         bool "SAMSUNG S3C2442"
         select CPU_ARM920T
-        select CPU_LLSERIAL_S3C2440
         select S3C2410_COMMON_CLK
         select S3C2410_DMA if S3C24XX_DMA
         select S3C2410_PM if PM
@@ -86,7 +81,6 @@ config CPU_S3C244X
 config CPU_S3C2443
         bool "SAMSUNG S3C2443"
         select CPU_ARM920T
-        select CPU_LLSERIAL_S3C2440
         select S3C2443_COMMON_CLK
         select S3C2443_DMA if S3C24XX_DMA
         help
@@ -148,28 +142,6 @@ config S3C2410_PM
         help
           Power Management code common to S3C2410 and better
 
-# low-level serial option nodes
-
-config CPU_LLSERIAL_S3C2410_ONLY
-        bool
-        default y if CPU_LLSERIAL_S3C2410 && !CPU_LLSERIAL_S3C2440
-
-config CPU_LLSERIAL_S3C2440_ONLY
-        bool
-        default y if CPU_LLSERIAL_S3C2440 && !CPU_LLSERIAL_S3C2410
-
-config CPU_LLSERIAL_S3C2410
-        bool
-        help
-          Selected if there is an S3C2410 (or register compatible) serial
-          low-level implementation needed
-
-config CPU_LLSERIAL_S3C2440
-        bool
-        help
-          Selected if there is an S3C2440 (or register compatible) serial
-          low-level implementation needed
-
 config S3C24XX_PLL
         bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
         depends on ARM_S3C24XX_CPUFREQ