summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 11:29:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 11:29:17 -0700
commit4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (patch)
tree153f92e4ac0d5c90890ee1b14458ea56e22f984e /arch/powerpc/configs
parent86ade88e15b0852fa437e816037ecb266ae990ad (diff)
parent036533e232922ec6667817de9b037d0b1ebd062e (diff)
downloadop-kernel-dev-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.zip
op-kernel-dev-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.tar.gz
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/powerpc/configs')
-rw-r--r--arch/powerpc/configs/ppc6xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 7d044df..12dc7c4 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -1808,7 +1808,7 @@ CONFIG_PCF8575=m
CONFIG_SENSORS_PCA9539=m
CONFIG_SENSORS_PCF8591=m
# CONFIG_TPS65010 is not set
-CONFIG_SENSORS_MAX6875=m
+CONFIG_EEPROM_MAX6875=m
CONFIG_SENSORS_TSL2550=m
CONFIG_MCU_MPC8349EMITX=m
# CONFIG_I2C_DEBUG_CORE is not set
OpenPOWER on IntegriCloud