diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-04-16 21:44:37 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-04-16 21:44:37 +0200 |
| commit | 69e620f866c983d59d7d41d74a08d39528161473 (patch) | |
| tree | 954f15bbbc060ea97a32d2ddf649693c86a84e62 /drivers/i2c/muxes/Makefile | |
| parent | cda816d163e08abb698f10ec32aa2d173ad93e7f (diff) | |
| parent | dbed8a803bd3fb64339a6180adaff2cec46242ce (diff) | |
| download | op-kernel-dev-69e620f866c983d59d7d41d74a08d39528161473.zip op-kernel-dev-69e620f866c983d59d7d41d74a08d39528161473.tar.gz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.12
Pull in changes from the i2c-mux subsubsystem:
"Here are a new LTC4306/5 driver, a fix needed by the RT kernel and some
error message cleanup."
Diffstat (limited to 'drivers/i2c/muxes/Makefile')
| -rw-r--r-- | drivers/i2c/muxes/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/muxes/Makefile b/drivers/i2c/muxes/Makefile index 9948fa4..ff7618c 100644 --- a/drivers/i2c/muxes/Makefile +++ b/drivers/i2c/muxes/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_I2C_ARB_GPIO_CHALLENGE) += i2c-arb-gpio-challenge.o obj-$(CONFIG_I2C_DEMUX_PINCTRL) += i2c-demux-pinctrl.o obj-$(CONFIG_I2C_MUX_GPIO) += i2c-mux-gpio.o +obj-$(CONFIG_I2C_MUX_LTC4306) += i2c-mux-ltc4306.o obj-$(CONFIG_I2C_MUX_MLXCPLD) += i2c-mux-mlxcpld.o obj-$(CONFIG_I2C_MUX_PCA9541) += i2c-mux-pca9541.o obj-$(CONFIG_I2C_MUX_PCA954x) += i2c-mux-pca954x.o |
