From: Kukjin Kim Date: Fri, 30 May 2014 17:36:49 +0000 (+0900) Subject: Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fced6dee29f6fb143fe16ea90331176ff77e6120;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos --- fced6dee29f6fb143fe16ea90331176ff77e6120 diff --cc arch/arm/mach-s3c24xx/Kconfig index 1e52b6926374,45a7026e9419..04284de7aca5 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@@ -27,8 -37,8 +27,7 @@@ comment "S3C24XX SoCs config CPU_S3C2410 bool "SAMSUNG S3C2410" default y - select COMMON_CLK 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 @@@ -40,8 -50,8 +39,7 @@@ config CPU_S3C2412 bool "SAMSUNG S3C2412" - select COMMON_CLK select CPU_ARM926T - select CPU_LLSERIAL_S3C2440 select S3C2412_COMMON_CLK select S3C2412_DMA if S3C24XX_DMA select S3C2412_PM if PM @@@ -50,8 -60,8 +48,7 @@@ config CPU_S3C2416 bool "SAMSUNG S3C2416/S3C2450" - select COMMON_CLK select CPU_ARM926T - select CPU_LLSERIAL_S3C2440 select S3C2416_PM if PM select S3C2443_COMMON_CLK select S3C2443_DMA if S3C24XX_DMA @@@ -60,8 -70,8 +57,7 @@@ config CPU_S3C2440 bool "SAMSUNG S3C2440" - select COMMON_CLK select CPU_ARM920T - select CPU_LLSERIAL_S3C2440 select S3C2410_COMMON_CLK select S3C2410_PM if PM select S3C2440_DMA if S3C24XX_DMA @@@ -70,8 -80,8 +66,7 @@@ config CPU_S3C2442 bool "SAMSUNG S3C2442" - select COMMON_CLK select CPU_ARM920T - select CPU_LLSERIAL_S3C2440 select S3C2410_COMMON_CLK select S3C2410_DMA if S3C24XX_DMA select S3C2410_PM if PM @@@ -85,8 -95,8 +80,7 @@@ config CPU_S3C244 config CPU_S3C2443 bool "SAMSUNG S3C2443" - select COMMON_CLK select CPU_ARM920T - select CPU_LLSERIAL_S3C2440 select S3C2443_COMMON_CLK select S3C2443_DMA if S3C24XX_DMA help