Skip to content

Commit

Permalink
ARM: S3C24XX: fix merge conflict
Browse files Browse the repository at this point in the history 
Missed some changes during re-sorting this branch.
So fixed it.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Kukjin Kim committed May 14, 2014
1 parent 2916f9a commit 34c453c
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/arm/mach-s3c24xx/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 34c453c

Please sign in to comment.