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/overo_defconfig | |
| parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
| parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/arm/configs/overo_defconfig')
| -rw-r--r-- | arch/arm/configs/overo_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/overo_defconfig b/arch/arm/configs/overo_defconfig index 49200967a153..a57f9e4124fa 100644 --- a/arch/arm/configs/overo_defconfig +++ b/arch/arm/configs/overo_defconfig | |||
| @@ -858,8 +858,8 @@ CONFIG_I2C_OMAP=y | |||
| 858 | # Miscellaneous I2C Chip support | 858 | # Miscellaneous I2C Chip support |
| 859 | # | 859 | # |
| 860 | # CONFIG_DS1682 is not set | 860 | # CONFIG_DS1682 is not set |
| 861 | # CONFIG_AT24 is not set | 861 | # CONFIG_EEPROM_AT24 is not set |
| 862 | CONFIG_SENSORS_EEPROM=y | 862 | CONFIG_EEPROM_LEGACY=y |
| 863 | # CONFIG_SENSORS_PCF8574 is not set | 863 | # CONFIG_SENSORS_PCF8574 is not set |
| 864 | # CONFIG_PCF8575 is not set | 864 | # CONFIG_PCF8575 is not set |
| 865 | # CONFIG_SENSORS_PCA9539 is not set | 865 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -885,7 +885,7 @@ CONFIG_SPI_OMAP24XX=y | |||
| 885 | # | 885 | # |
| 886 | # SPI Protocol Masters | 886 | # SPI Protocol Masters |
| 887 | # | 887 | # |
| 888 | # CONFIG_SPI_AT25 is not set | 888 | # CONFIG_EEPROM_AT25 is not set |
| 889 | # CONFIG_SPI_SPIDEV is not set | 889 | # CONFIG_SPI_SPIDEV is not set |
| 890 | # CONFIG_SPI_TLE62X0 is not set | 890 | # CONFIG_SPI_TLE62X0 is not set |
| 891 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 891 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |