summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/neponset_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 12:47:28 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 12:47:28 +0100
commit7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch)
tree0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/arm/configs/neponset_defconfig
parentIA64: fix swiotlb alloc_coherent for non DMA_64BIT_MASK devices, fix (diff)
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
downloadlinux-7df4edb07cf54a4868b9a750424c0d2aa68f8d66.tar.xz
linux-7df4edb07cf54a4868b9a750424c0d2aa68f8d66.zip
Merge branch 'linus' into core/iommu
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