diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 14:29:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 14:29:17 -0400 |
| commit | 4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (patch) | |
| tree | 153f92e4ac0d5c90890ee1b14458ea56e22f984e /arch/mips | |
| parent | 86ade88e15b0852fa437e816037ecb266ae990ad (diff) | |
| parent | 036533e232922ec6667817de9b037d0b1ebd062e (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
therm_windtunnel: Convert to a new-style i2c driver
therm_adt746x: Convert to a new-style i2c driver
windfarm: Convert to new-style i2c drivers
therm_pm72: Convert to a new-style i2c driver
i2c-viapro: Add new PCI device ID for VX855
i2c/chips: Move max6875 to drivers/misc/eeprom
i2c: Do not give adapters a default parent
i2c: Do not probe for TV chips on Voodoo3 adapters
i2c: Retry automatically on arbitration loss
i2c: Remove void casts
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/mtx1_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 783da855a2e3..d6d35b2e5fe8 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
| @@ -963,7 +963,7 @@ 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 |
| 966 | CONFIG_SENSORS_MAX6875=y | 966 | CONFIG_EEPROM_MAX6875=y |
| 967 | # CONFIG_SENSORS_TSL2550 is not set | 967 | # CONFIG_SENSORS_TSL2550 is not set |
| 968 | CONFIG_I2C_DEBUG_CORE=y | 968 | CONFIG_I2C_DEBUG_CORE=y |
| 969 | CONFIG_I2C_DEBUG_ALGO=y | 969 | CONFIG_I2C_DEBUG_ALGO=y |
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index 8426d3b9501c..fadb351d249b 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
| @@ -1849,7 +1849,7 @@ CONFIG_EEPROM_LEGACY=m | |||
| 1849 | CONFIG_SENSORS_PCF8574=m | 1849 | CONFIG_SENSORS_PCF8574=m |
| 1850 | CONFIG_SENSORS_PCA9539=m | 1850 | CONFIG_SENSORS_PCA9539=m |
| 1851 | CONFIG_SENSORS_PCF8591=m | 1851 | CONFIG_SENSORS_PCF8591=m |
| 1852 | CONFIG_SENSORS_MAX6875=m | 1852 | CONFIG_EEPROM_MAX6875=m |
| 1853 | # CONFIG_SENSORS_TSL2550 is not set | 1853 | # CONFIG_SENSORS_TSL2550 is not set |
| 1854 | # CONFIG_I2C_DEBUG_CORE is not set | 1854 | # CONFIG_I2C_DEBUG_CORE is not set |
| 1855 | # CONFIG_I2C_DEBUG_ALGO is not set | 1855 | # CONFIG_I2C_DEBUG_ALGO is not set |