diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:30:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 12:30:48 -0400 |
commit | 40aba218969914d1b225e742617adb921cf94eae (patch) | |
tree | 663ec9cdadbedec5f8eab754cbc590298c1d40be /drivers/i2c/busses/Makefile | |
parent | b64ada6b23d4a305fb3ca59b79dd38707fc53b69 (diff) | |
parent | cfd550ed3d3bd509b475c7a9d425fc63bf843a7c (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: Clearly mark ACPI drivers as such
i2c: Add driver for SMBus Control Method Interface
i2c-pnx: Correct use of request_region/request_mem_region
MAINTAINERS: Add maintainer for AT24 and PCA9564/PCA9665
i2c-piix4: Add AMD SB900 SMBus device ID
i2c/chips: Remove deprecated pcf8574 driver
i2c/chips: Remove deprecated pca9539 driver
i2c/chips: Remove deprecated pcf8575 driver
gpio/pcf857x: Copy i2c_device_id from old pcf8574 driver
i2c/scx200_acb: Provide more information on bus errors
i2c: Provide compatibility links for i2c adapters
i2c: Convert i2c adapters to bus devices
i2c: Convert i2c clients to a device type
i2c/tsl2550: Use combined SMBus transactions
i2c-taos-evm: Switch echo off to improve performance
i2c: Drop unused i2c_driver.id field
Diffstat (limited to 'drivers/i2c/busses/Makefile')
-rw-r--r-- | drivers/i2c/busses/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index e654263bfc01..ff937ac69f5b 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile | |||
@@ -2,6 +2,9 @@ | |||
2 | # Makefile for the i2c bus drivers. | 2 | # Makefile for the i2c bus drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | # ACPI drivers | ||
6 | obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o | ||
7 | |||
5 | # PC SMBus host controller drivers | 8 | # PC SMBus host controller drivers |
6 | obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o | 9 | obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o |
7 | obj-$(CONFIG_I2C_ALI1563) += i2c-ali1563.o | 10 | obj-$(CONFIG_I2C_ALI1563) += i2c-ali1563.o |