From: Kukjin Kim Date: Thu, 8 May 2014 20:51:43 +0000 (+0900) Subject: ARM: S3C24XX: fix merge conflict X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34c453ce16633539a94a2e876faeb731ac1be899;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git ARM: S3C24XX: fix merge conflict Missed some changes during re-sorting this branch. So fixed it. Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 1331e784c713..22d149bcfcc6 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -347,7 +347,6 @@ config MACH_VR1000 bool "Thorcom VR1000" select MACH_BAST_IDE select S3C2410_COMMON_DCLK if COMMON_CLK - select S3C24XX_DCLK if SAMSUNG_CLOCK select S3C24XX_SIMTEC_NOR select S3C24XX_SIMTEC_PM if PM select S3C24XX_SIMTEC_USB @@ -644,7 +643,6 @@ config MACH_RX1950 select S3C2410_COMMON_DCLK if COMMON_CLK select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ select S3C2440_XTAL_16934400 - select S3C24XX_DCLK if SAMSUNG_CLOCK select S3C24XX_PWM select S3C_DEV_NAND help