diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 20:40:55 +0100 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 20:40:55 +0100 |
commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
tree | da9759151e00221c58cdd9f4de893c0b08753670 /arch/arm/configs/neponset_defconfig | |
parent | jfs: Fix error handling in metapage_writepage() (diff) | |
parent | Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
download | linux-8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c.tar.xz linux-8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c.zip |
Merge branch 'master' of /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/arm/configs/neponset_defconfig')
-rw-r--r-- | arch/arm/configs/neponset_defconfig | 2 |
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 |