diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 16:14:38 +0100 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 16:14:38 +0100 |
commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /arch/avr32/configs/mimc200_defconfig | |
parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
download | kernel_samsung_tuna-b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9.zip kernel_samsung_tuna-b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9.tar.gz kernel_samsung_tuna-b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'arch/avr32/configs/mimc200_defconfig')
-rw-r--r-- | arch/avr32/configs/mimc200_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig index 981e4f8..1a58ffb 100644 --- a/arch/avr32/configs/mimc200_defconfig +++ b/arch/avr32/configs/mimc200_defconfig @@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y # Miscellaneous I2C Chip support # # CONFIG_DS1682 is not set -CONFIG_AT24=y -# CONFIG_SENSORS_EEPROM is not set +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_LEGACY is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_PCF8575 is not set # CONFIG_SENSORS_PCA9539 is not set @@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y # # SPI Protocol Masters # -CONFIG_SPI_AT25=y +CONFIG_EEPROM_AT25=y # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_TLE62X0 is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y |