diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 18:26:44 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-17 18:26:44 -0400 |
| commit | 6bf6d1af86e7dec914f7916f2a00910650a73469 (patch) | |
| tree | 7fb14c7fce10a9f3e5c48f49941b8642562017ec /arch/arm/mach-s3c24xx | |
| parent | 45a690f6bcd5506d9988d0d069811ac9380750ad (diff) | |
| parent | 63f49dce39e5d6a19e5f1f9004eb48e73ba259e8 (diff) | |
Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7
Diffstat (limited to 'arch/arm/mach-s3c24xx')
| -rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index e24961109b70..d56b0f7f2b20 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
| @@ -483,7 +483,7 @@ config MACH_NEO1973_GTA02 | |||
| 483 | select I2C | 483 | select I2C |
| 484 | select POWER_SUPPLY | 484 | select POWER_SUPPLY |
| 485 | select MACH_NEO1973 | 485 | select MACH_NEO1973 |
| 486 | select S3C2410_PWM | 486 | select S3C24XX_PWM |
| 487 | select S3C_DEV_USB_HOST | 487 | select S3C_DEV_USB_HOST |
| 488 | help | 488 | help |
| 489 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone | 489 | Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone |
| @@ -493,7 +493,7 @@ config MACH_RX1950 | |||
| 493 | select S3C24XX_DCLK | 493 | select S3C24XX_DCLK |
| 494 | select PM_H1940 if PM | 494 | select PM_H1940 if PM |
| 495 | select I2C | 495 | select I2C |
| 496 | select S3C2410_PWM | 496 | select S3C24XX_PWM |
| 497 | select S3C_DEV_NAND | 497 | select S3C_DEV_NAND |
| 498 | select S3C2410_IOTIMING if S3C2440_CPUFREQ | 498 | select S3C2410_IOTIMING if S3C2440_CPUFREQ |
| 499 | select S3C2440_XTAL_16934400 | 499 | select S3C2440_XTAL_16934400 |