diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-08 16:51:43 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-14 16:54:38 -0400 |
| commit | 34c453ce16633539a94a2e876faeb731ac1be899 (patch) | |
| tree | cbd8013079b316cc796044f7cb28d9b5a907ade5 | |
| parent | 2916f9a2c6d9200b4c840a613cd1fa1dad04240f (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 2 |
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 | |||
| 347 | bool "Thorcom VR1000" | 347 | bool "Thorcom VR1000" |
| 348 | select MACH_BAST_IDE | 348 | select MACH_BAST_IDE |
| 349 | select S3C2410_COMMON_DCLK if COMMON_CLK | 349 | select S3C2410_COMMON_DCLK if COMMON_CLK |
| 350 | select S3C24XX_DCLK if SAMSUNG_CLOCK | ||
| 351 | select S3C24XX_SIMTEC_NOR | 350 | select S3C24XX_SIMTEC_NOR |
| 352 | select S3C24XX_SIMTEC_PM if PM | 351 | select S3C24XX_SIMTEC_PM if PM |
| 353 | select S3C24XX_SIMTEC_USB | 352 | select S3C24XX_SIMTEC_USB |
| @@ -644,7 +643,6 @@ config MACH_RX1950 | |||
| 644 | select S3C2410_COMMON_DCLK if COMMON_CLK | 643 | select S3C2410_COMMON_DCLK if COMMON_CLK |
| 645 | select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ | 644 | select S3C2410_IOTIMING if ARM_S3C2440_CPUFREQ |
| 646 | select S3C2440_XTAL_16934400 | 645 | select S3C2440_XTAL_16934400 |
| 647 | select S3C24XX_DCLK if SAMSUNG_CLOCK | ||
| 648 | select S3C24XX_PWM | 646 | select S3C24XX_PWM |
| 649 | select S3C_DEV_NAND | 647 | select S3C_DEV_NAND |
| 650 | help | 648 | help |