summaryrefslogtreecommitdiff
path: root/arch/arm/configs/neponset_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-04 16:54:56 +0300
committerIngo Molnar <mingo@elte.hu>2009-02-04 16:54:56 +0300
commitbb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch)
treed2295a923fabb1b01b25bb015c4c2e42ee9df5ca /arch/arm/configs/neponset_defconfig
parent858770619debfb9269add63e4ba8b7c6b5538dd1 (diff)
parent06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff)
downloadlinux-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.xz
Merge branch 'core/xen' into x86/urgent
Diffstat (limited to 'arch/arm/configs/neponset_defconfig')
-rw-r--r--arch/arm/configs/neponset_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig
index 92ccdc6492f7..d81ea219c934 100644
--- a/arch/arm/configs/neponset_defconfig
+++ b/arch/arm/configs/neponset_defconfig
@@ -737,7 +737,7 @@ CONFIG_I2C_ALGOBIT=y
#
# Other I2C Chip support
#
-# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_EEPROM_LEGACY is not set
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_RTC8564 is not set