diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:17 -0700 |
| commit | 4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (patch) | |
| tree | 153f92e4ac0d5c90890ee1b14458ea56e22f984e /drivers/misc/eeprom/Makefile | |
| 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 'drivers/misc/eeprom/Makefile')
| -rw-r--r-- | drivers/misc/eeprom/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/eeprom/Makefile b/drivers/misc/eeprom/Makefile index 539dd8f8812..df3d68ffa9d 100644 --- a/drivers/misc/eeprom/Makefile +++ b/drivers/misc/eeprom/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_EEPROM_AT24) += at24.o obj-$(CONFIG_EEPROM_AT25) += at25.o obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o +obj-$(CONFIG_EEPROM_MAX6875) += max6875.o obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o |