Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ARM: S3C24XX: fix merge conflict

Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Kukjin Kim 11 years ago
parent
2916f9a2c6
commit
34c453ce16
1 changed files with 0 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 2
      arch/arm/mach-s3c24xx/Kconfig

+ 0 - 2
arch/arm/mach-s3c24xx/Kconfig
View File 

@@ -347,7 +347,6 @@ config MACH_VR1000
 
 	bool "Thorcom VR1000"
 
 	bool "Thorcom VR1000"
 
 	select MACH_BAST_IDE
 
 	select MACH_BAST_IDE
 
 	select S3C2410_COMMON_DCLK if COMMON_CLK
 
 	select S3C2410_COMMON_DCLK if COMMON_CLK
 
-	select S3C24XX_DCLK if SAMSUNG_CLOCK
 
 	select S3C24XX_SIMTEC_NOR
 
 	select S3C24XX_SIMTEC_NOR
 
 	select S3C24XX_SIMTEC_PM if PM
 
 	select S3C24XX_SIMTEC_PM if PM
 
 	select S3C24XX_SIMTEC_USB
 
 	select S3C24XX_SIMTEC_USB
 
@@ -644,7 +643,6 @@ config MACH_RX1950
 
 	select S3C2410_COMMON_DCLK if COMMON_CLK
 
 	select S3C2410_COMMON_DCLK if COMMON_CLK
 
 	select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
 
 	select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ
 
 	select S3C2440_XTAL_16934400
 
 	select S3C2440_XTAL_16934400
 
-	select S3C24XX_DCLK if SAMSUNG_CLOCK
 
 	select S3C24XX_PWM
 
 	select S3C24XX_PWM
 
 	select S3C_DEV_NAND
 
 	select S3C_DEV_NAND
 
 	help
 
 	help