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/83xx/mpc834x_itx_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/83xx/mpc834x_itx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index 07a674f5344..42b7f3403fb 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
| @@ -898,8 +898,8 @@ CONFIG_I2C_MPC=y | |||
| 898 | # Miscellaneous I2C Chip support | 898 | # Miscellaneous I2C Chip support |
| 899 | # | 899 | # |
| 900 | # CONFIG_DS1682 is not set | 900 | # CONFIG_DS1682 is not set |
| 901 | # CONFIG_AT24 is not set | 901 | # CONFIG_EEPROM_AT24 is not set |
| 902 | # CONFIG_SENSORS_EEPROM is not set | 902 | # CONFIG_EEPROM_LEGACY is not set |
| 903 | CONFIG_SENSORS_PCF8574=y | 903 | CONFIG_SENSORS_PCF8574=y |
| 904 | # CONFIG_PCF8575 is not set | 904 | # CONFIG_PCF8575 is not set |
| 905 | # CONFIG_SENSORS_PCA9539 is not set | 905 | # CONFIG_SENSORS_PCA9539 is not set |
| @@ -923,7 +923,7 @@ CONFIG_SPI_MPC83xx=y | |||
| 923 | # | 923 | # |
| 924 | # SPI Protocol Masters | 924 | # SPI Protocol Masters |
| 925 | # | 925 | # |
| 926 | # CONFIG_SPI_AT25 is not set | 926 | # CONFIG_EEPROM_AT25 is not set |
| 927 | # CONFIG_SPI_SPIDEV is not set | 927 | # CONFIG_SPI_SPIDEV is not set |
| 928 | # CONFIG_SPI_TLE62X0 is not set | 928 | # CONFIG_SPI_TLE62X0 is not set |
| 929 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | 929 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |