projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'gcl/merge' into merge
[linux-2.6]
/
arch
/
powerpc
/
configs
/
ppc6xx_defconfig
diff --git
a/arch/powerpc/configs/ppc6xx_defconfig
b/arch/powerpc/configs/ppc6xx_defconfig
index
01f05ec
..
7d044df
100644
(file)
--- a/
arch/powerpc/configs/ppc6xx_defconfig
+++ b/
arch/powerpc/configs/ppc6xx_defconfig
@@
-1801,8
+1801,8
@@
CONFIG_I2C_STUB=m
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
-CONFIG_AT24=m
-CONFIG_
SENSORS_EEPROM
=m
+CONFIG_
EEPROM_
AT24=m
+CONFIG_
EEPROM_LEGACY
=m
CONFIG_SENSORS_PCF8574=m
CONFIG_PCF8575=m
CONFIG_SENSORS_PCA9539=m