diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 18:11:41 -0500 |
| commit | cfb901bf84fe22eb86525e9fb20675b53fb0462a (patch) | |
| tree | e1e710df2c1ba0da26b12f7487fdac6cedc7e166 /arch/avr32/configs/mimc200_defconfig | |
| parent | 2034563ca323ee45f37a32911550d21c1f1e9626 (diff) | |
| parent | 5fb4523afbffae5a5cec4989ee4c9fbc3dbdef33 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Warn on deprecated binding model use
eeprom: More consistent symbol names
eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom
spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom
i2c: Move old eeprom driver to /drivers/misc/eeprom
i2c: Move at24 to drivers/misc/eeprom
i2c: Quilt tree has moved
i2c: Delete many unused adapter IDs
i2c: Delete 10 unused driver IDs
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 981e4f8b8aeb..1a58ffbc752d 100644 --- a/arch/avr32/configs/mimc200_defconfig +++ b/arch/avr32/configs/mimc200_defconfig | |||
| @@ -565,8 +565,8 @@ CONFIG_I2C_GPIO=y | |||
| 565 | # Miscellaneous I2C Chip support | 565 | # Miscellaneous I2C Chip support |
| 566 | # | 566 | # |
| 567 | # CONFIG_DS1682 is not set | 567 | # CONFIG_DS1682 is not set |
| 568 | CONFIG_AT24=y | 568 | CONFIG_EEPROM_AT24=y |
| 569 | # CONFIG_SENSORS_EEPROM is not set | 569 | # CONFIG_EEPROM_LEGACY is not set |
| 570 | # CONFIG_SENSORS_PCF8574 is not set | 570 | # CONFIG_SENSORS_PCF8574 is not set |
| 571 | # CONFIG_PCF8575 is not set | 571 | # CONFIG_PCF8575 is not set |
| 572 | # CONFIG_SENSORS_PCA9539 is not set | 572 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -592,7 +592,7 @@ CONFIG_SPI_ATMEL=y | |||
| 592 | # | 592 | # |
| 593 | # SPI Protocol Masters | 593 | # SPI Protocol Masters |
| 594 | # | 594 | # |
| 595 | CONFIG_SPI_AT25=y | 595 | CONFIG_EEPROM_AT25=y |
| 596 | # CONFIG_SPI_SPIDEV is not set | 596 | # CONFIG_SPI_SPIDEV is not set |
| 597 | # CONFIG_SPI_TLE62X0 is not set | 597 | # CONFIG_SPI_TLE62X0 is not set |
| 598 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 598 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |