projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'kumar/kumar-merge' into merge
[linux-2.6-block.git]
/
arch
/
powerpc
/
configs
/
83xx
/
mpc836x_mds_defconfig
diff --git
a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index 8306e074c3fe6d23244e13506bed903d3c6cfd98..76db8138eac72294d516e9dae3954adfaebcbbf2 100644
(file)
--- a/
arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/
arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@
-835,8
+835,8
@@
CONFIG_I2C_MPC=y
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
-# CONFIG_AT24 is not set
-# CONFIG_
SENSORS_EEPROM
is not set
+# CONFIG_
EEPROM_
AT24 is not set
+# CONFIG_
EEPROM_LEGACY
is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set