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/hammerhead_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/hammerhead_defconfig')
| -rw-r--r-- | arch/avr32/configs/hammerhead_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig index 0d3d2982c8f5..3970fcc4d76e 100644 --- a/arch/avr32/configs/hammerhead_defconfig +++ b/arch/avr32/configs/hammerhead_defconfig | |||
| @@ -716,8 +716,8 @@ CONFIG_I2C_GPIO=m | |||
| 716 | # Miscellaneous I2C Chip support | 716 | # Miscellaneous I2C Chip support |
| 717 | # | 717 | # |
| 718 | # CONFIG_DS1682 is not set | 718 | # CONFIG_DS1682 is not set |
| 719 | # CONFIG_AT24 is not set | 719 | # CONFIG_EEPROM_AT24 is not set |
| 720 | # CONFIG_SENSORS_EEPROM is not set | 720 | # CONFIG_EEPROM_LEGACY is not set |
| 721 | # CONFIG_SENSORS_PCF8574 is not set | 721 | # CONFIG_SENSORS_PCF8574 is not set |
| 722 | # CONFIG_PCF8575 is not set | 722 | # CONFIG_PCF8575 is not set |
| 723 | # CONFIG_SENSORS_PCA9539 is not set | 723 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -742,7 +742,7 @@ CONFIG_SPI_ATMEL=y | |||
| 742 | # | 742 | # |
| 743 | # SPI Protocol Masters | 743 | # SPI Protocol Masters |
| 744 | # | 744 | # |
| 745 | # CONFIG_SPI_AT25 is not set | 745 | # CONFIG_EEPROM_AT25 is not set |
| 746 | CONFIG_SPI_SPIDEV=m | 746 | CONFIG_SPI_SPIDEV=m |
| 747 | # CONFIG_SPI_TLE62X0 is not set | 747 | # CONFIG_SPI_TLE62X0 is not set |
| 748 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | 748 | CONFIG_ARCH_REQUIRE_GPIOLIB=y |