Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c453ce authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S3C24XX: fix merge conflict 



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

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2916f9a2

arch/arm/mach-s3c24xx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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