aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2014-05-09 05:51:43 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-05-15 05:54:38 +0900
commit34c453ce16633539a94a2e876faeb731ac1be899 (patch)
treecbd8013079b316cc796044f7cb28d9b5a907ade5 /arch/arm/mach-s3c24xx
parent2916f9a2c6d9200b4c840a613cd1fa1dad04240f (diff)
downloadlinux-linaro-stable-34c453ce16633539a94a2e876faeb731ac1be899.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-s3c24xx')
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig2
1 files changed, 0 insertions, 2 deletions
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