diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 08:17:28 +0100 |
| commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
| tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /arch/arm/configs/at91sam9263ek_defconfig | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) | |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'arch/arm/configs/at91sam9263ek_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9263ek_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index a7ddd94363ca..036a126725c1 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig @@ -670,7 +670,7 @@ CONFIG_I2C_GPIO=y # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set # CONFIG_DS1682 is not set -# CONFIG_SENSORS_EEPROM is not set +# CONFIG_EEPROM_LEGACY is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -697,7 +697,7 @@ CONFIG_SPI_ATMEL=y # # SPI Protocol Masters # -# CONFIG_SPI_AT25 is not set +# CONFIG_EEPROM_AT25 is not set # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_W1 is not set |