diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /drivers/i2c/busses/Makefile | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
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 |