diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 11:13:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 11:13:04 -0700 |
| commit | bced86359918326a65258b1be245834e5c493c88 (patch) | |
| tree | 72566bf1beefd3e1cc267e2dd5cc3188ab87b836 /drivers/i2c/Makefile | |
| parent | ceb804cd0f63b0e0a87b81913b66add6de03043d (diff) | |
| parent | 0a9c14751377a1407f5e35791e13651d2fc7801c (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:
i2c-algo-bit: Add pre- and post-xfer hooks
at24: Init dynamic bin_attribute structures
i2c: Drop configure option I2C_DEBUG_CHIP
tsl2550: Move from i2c/chips to misc
i2c-i801: Don't use the block buffer for I2C block writes
i2c-powermac: Be less verbose in the absence of real errors.
i2c-smbus: Use device_lock/device_unlock
Diffstat (limited to 'drivers/i2c/Makefile')
| -rw-r--r-- | drivers/i2c/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index acd0250c16a0..a7d9b4be9bb3 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_I2C_BOARDINFO) += i2c-boardinfo.o obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C_SMBUS) += i2c-smbus.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o -obj-y += busses/ chips/ algos/ +obj-y += algos/ busses/ ifeq ($(CONFIG_I2C_DEBUG_CORE),y) EXTRA_CFLAGS += -DDEBUG |