diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/mips/configs/bigsur_defconfig | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 | |||
| 959 | # Miscellaneous I2C Chip support | 959 | # Miscellaneous I2C Chip support |
| 960 | # | 960 | # |
| 961 | # CONFIG_DS1682 is not set | 961 | # CONFIG_DS1682 is not set |
| 962 | CONFIG_SENSORS_EEPROM=y | 962 | CONFIG_EEPROM_LEGACY=y |
| 963 | CONFIG_SENSORS_PCF8574=y | 963 | CONFIG_SENSORS_PCF8574=y |
| 964 | # CONFIG_PCF8575 is not set | 964 | # CONFIG_PCF8575 is not set |
| 965 | CONFIG_SENSORS_PCF8591=y | 965 | CONFIG_SENSORS_PCF8591=y |