summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/chips/Makefile
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 /drivers/i2c/chips/Makefile
parent86ade88e15b0852fa437e816037ecb266ae990ad (diff)
parent036533e232922ec6667817de9b037d0b1ebd062e (diff)
downloadtalos-obmc-linux-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.tar.gz
talos-obmc-linux-4858704da75ba84ce21e6d4b3b974e8b8594c9f2.zip
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 'drivers/i2c/chips/Makefile')
-rw-r--r--drivers/i2c/chips/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 55a376037183..f4680d16ee34 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -11,7 +11,6 @@
#
obj-$(CONFIG_DS1682) += ds1682.o
-obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
obj-$(CONFIG_PCF8575) += pcf8575.o
OpenPOWER on IntegriCloud