diff options
author | Ben Dooks <ben-linux@fluff.org> | 2011-03-20 22:14:04 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-20 22:14:04 +0000 |
commit | e4394d553cec3cbf4d0c602fe39bc88bac43bd27 (patch) | |
tree | 89db4a86ac03f74ca6bf0e7b00f8cbf044ff4ccf /drivers/i2c/busses/Makefile | |
parent | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (diff) | |
parent | 335d7c58fcc1b71387a2c38b610b08bb9d3a6fcc (diff) | |
download | talos-obmc-linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.tar.gz talos-obmc-linux-e4394d553cec3cbf4d0c602fe39bc88bac43bd27.zip |
Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12
Diffstat (limited to 'drivers/i2c/busses/Makefile')
-rw-r--r-- | drivers/i2c/busses/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 3878c959d4fa..8596cfdb43ef 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o # External I2C/SMBus adapter drivers +obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o obj-$(CONFIG_I2C_PARPORT) += i2c-parport.o obj-$(CONFIG_I2C_PARPORT_LIGHT) += i2c-parport-light.o obj-$(CONFIG_I2C_TAOS_EVM) += i2c-taos-evm.o |