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/mips/configs/bigsur_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/mips/configs/bigsur_defconfig')
-rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index a3bbbf067a3b..783da855a2e3 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig @@ -959,7 +959,7 @@ CONFIG_I2C_SIBYTE=y # Miscellaneous I2C Chip support # # CONFIG_DS1682 is not set -CONFIG_SENSORS_EEPROM=y +CONFIG_EEPROM_LEGACY=y CONFIG_SENSORS_PCF8574=y # CONFIG_PCF8575 is not set CONFIG_SENSORS_PCF8591=y |