projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/asm' into x86/mm
[linux-2.6]
/
arch
/
arm
/
configs
/
mv78xx0_defconfig
diff --git
a/arch/arm/configs/mv78xx0_defconfig
b/arch/arm/configs/mv78xx0_defconfig
index
d38ebf8
..
83c817f
100644
(file)
--- a/
arch/arm/configs/mv78xx0_defconfig
+++ b/
arch/arm/configs/mv78xx0_defconfig
@@
-832,7
+832,7
@@
CONFIG_I2C_MV64XXX=y
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
-# CONFIG_
SENSORS_EEPROM
is not set
+# CONFIG_
EEPROM_LEGACY
is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCF8591 is not set