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 'fix/hda' into topic/hda
[linux-2.6]
/
arch
/
arm
/
configs
/
ixp2000_defconfig
diff --git
a/arch/arm/configs/ixp2000_defconfig
b/arch/arm/configs/ixp2000_defconfig
index
84680db
..
57526c1
100644
(file)
--- a/
arch/arm/configs/ixp2000_defconfig
+++ b/
arch/arm/configs/ixp2000_defconfig
@@
-768,7
+768,7
@@
CONFIG_I2C_IXP2000=y
#
# CONFIG_SENSORS_DS1337 is not set
# CONFIG_SENSORS_DS1374 is not set
-CONFIG_
SENSORS_EEPROM
=y
+CONFIG_
EEPROM_LEGACY
=y
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set