diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
| commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
| tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/arm/configs/s3c2410_defconfig | |
| parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
| parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/arm/configs/s3c2410_defconfig')
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 35faaea8623e..65a583ee5df8 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
| @@ -923,7 +923,7 @@ CONFIG_I2C_SIMTEC=y | |||
| 923 | # Miscellaneous I2C Chip support | 923 | # Miscellaneous I2C Chip support |
| 924 | # | 924 | # |
| 925 | # CONFIG_DS1682 is not set | 925 | # CONFIG_DS1682 is not set |
| 926 | CONFIG_SENSORS_EEPROM=m | 926 | CONFIG_EEPROM_LEGACY=m |
| 927 | # CONFIG_SENSORS_PCF8574 is not set | 927 | # CONFIG_SENSORS_PCF8574 is not set |
| 928 | # CONFIG_PCF8575 is not set | 928 | # CONFIG_PCF8575 is not set |
| 929 | # CONFIG_SENSORS_PCF8591 is not set | 929 | # CONFIG_SENSORS_PCF8591 is not set |
| @@ -950,7 +950,7 @@ CONFIG_SPI_S3C24XX_GPIO=m | |||
| 950 | # | 950 | # |
| 951 | # SPI Protocol Masters | 951 | # SPI Protocol Masters |
| 952 | # | 952 | # |
| 953 | # CONFIG_SPI_AT25 is not set | 953 | # CONFIG_EEPROM_AT25 is not set |
| 954 | # CONFIG_SPI_SPIDEV is not set | 954 | # CONFIG_SPI_SPIDEV is not set |
| 955 | # CONFIG_SPI_TLE62X0 is not set | 955 | # CONFIG_SPI_TLE62X0 is not set |
| 956 | CONFIG_HAVE_GPIO_LIB=y | 956 | CONFIG_HAVE_GPIO_LIB=y |