diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 17:38:41 +0100 |
| commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
| tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/arm/configs/ep93xx_defconfig | |
| parent | don't reallocate sxp variable passed into xfs_swapext (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.tar.xz linux-6d2160bfe7826aca1c94b4bca77093908a452ae7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/arm/configs/ep93xx_defconfig')
| -rw-r--r-- | arch/arm/configs/ep93xx_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 21aa013793c6..3f89d5f25bce 100644 --- 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 |