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/powerpc/configs/mpc85xx_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/powerpc/configs/mpc85xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index c87b53abc617..55e5ebd91cd0 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -860,8 +860,8 @@ CONFIG_I2C_MPC=y | |||
| 860 | # Miscellaneous I2C Chip support | 860 | # Miscellaneous I2C Chip support |
| 861 | # | 861 | # |
| 862 | # CONFIG_DS1682 is not set | 862 | # CONFIG_DS1682 is not set |
| 863 | # CONFIG_AT24 is not set | 863 | # CONFIG_EEPROM_AT24 is not set |
| 864 | CONFIG_SENSORS_EEPROM=y | 864 | CONFIG_EEPROM_LEGACY=y |
| 865 | # CONFIG_SENSORS_PCF8574 is not set | 865 | # CONFIG_SENSORS_PCF8574 is not set |
| 866 | # CONFIG_PCF8575 is not set | 866 | # CONFIG_PCF8575 is not set |
| 867 | # CONFIG_SENSORS_PCA9539 is not set | 867 | # CONFIG_SENSORS_PCA9539 is not set |