ARM: S3C24XX: fix merge conflict

Missed some changes during re-sorting this branch. So fixed it. Signed-off-by: Kukjin Kim <[email protected]>
SKAPUSTIANSKYI · May 14, 2014 · 34c453c · 34c453c
1 parent 2916f9a
commit 34c453c
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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