git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
ep93xx_defconfig
diff --git
a/arch/arm/configs/ep93xx_defconfig
b/arch/arm/configs/ep93xx_defconfig
index 21aa013793c6e6e5771218ba7dcd8b989335c209..3f89d5f25bcef998f1caf44f539706b6f9784771 100644
(file)
--- a/
arch/arm/configs/ep93xx_defconfig
+++ b/
arch/arm/configs/ep93xx_defconfig
@@
-681,7
+681,7
@@
CONFIG_I2C_ALGOBIT=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