diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 07:34:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-03 07:34:47 -0800 |
| commit | a03696e912cd544e1504a79e49600cdb535f42db (patch) | |
| tree | 7a9357153c3479f103cf74ea90ce4a5c983b0f2d /drivers/i2c/Makefile | |
| parent | 0a135ba14d71fb84c691a5386aff5049691fe6d7 (diff) | |
| parent | 0c43ea544c1086fbbed5a6c99ea58eb64674ea8f (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: Document the message size limit
i2c-algo-pca: Drop duplicate variable
i2c: Hook up runtime PM support
i2c-parport-light: Add SMBus alert support
i2c-parport: Add SMBus alert support
i2c: Separate Kconfig option for i2c-smbus
i2c: Add SMBus alert support
i2c-parport: Give powered devices some time to settle
i2c-tiny-usb: Fix a comment on bus frequency
i2c-i801: Add Intel Cougar Point device IDs
i2c: Make PCI device ids constant
Diffstat (limited to 'drivers/i2c/Makefile')
| -rw-r--r-- | drivers/i2c/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index ba26e6cbe74..acd0250c16a 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -4,6 +4,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/ |