diff options
| author | Wolfram Sang | 2017-07-31 16:12:19 +0200 |
|---|---|---|
| committer | Wolfram Sang | 2017-07-31 16:12:19 +0200 |
| commit | c69b9e1278a2a23482a12bf56e54463f03b9e3f1 (patch) | |
| tree | 1f47ea42a169073c3b3bcc88f49adfc1eedec6ae /drivers/i2c | |
| parent | i2c: designware: Some broken DSTDs use 1MiHz instead of 1MHz (diff) | |
| parent | i2c: mux: pinctrl: mention correct module name in Kconfig help text (diff) | |
| download | kernel-qcow2-linux-c69b9e1278a2a23482a12bf56e54463f03b9e3f1.tar.gz kernel-qcow2-linux-c69b9e1278a2a23482a12bf56e54463f03b9e3f1.tar.xz kernel-qcow2-linux-c69b9e1278a2a23482a12bf56e54463f03b9e3f1.zip | |
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/muxes/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index 2c64d0e0740f..17121329bb79 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig @@ -83,7 +83,7 @@ config I2C_MUX_PINCTRL different sets of pins at run-time. This driver can also be built as a module. If so, the module will be - called pinctrl-i2cmux. + called i2c-mux-pinctrl. config I2C_MUX_REG tristate "Register-based I2C multiplexer" |