diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-20 08:22:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-20 08:22:34 -0400 |
commit | 6a991acceedce3ca93caef8ba7af2468c9451614 (patch) | |
tree | 1997d71fc57bdebd12fc70a73070281614b52f15 /drivers/i2c/muxes/Kconfig | |
parent | 70fb74a5420f9caa3e001d65004e4b669124283e (diff) | |
parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) |
Merge commit 'v3.5-rc3' into x86/debug
Merge it in to pick up a fix that we are going to clean up in this
branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/i2c/muxes/Kconfig')
-rw-r--r-- | drivers/i2c/muxes/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig index beb2491db27..a0edd985421 100644 --- a/drivers/i2c/muxes/Kconfig +++ b/drivers/i2c/muxes/Kconfig | |||
@@ -37,4 +37,16 @@ config I2C_MUX_PCA954x | |||
37 | This driver can also be built as a module. If so, the module | 37 | This driver can also be built as a module. If so, the module |
38 | will be called i2c-mux-pca954x. | 38 | will be called i2c-mux-pca954x. |
39 | 39 | ||
40 | config I2C_MUX_PINCTRL | ||
41 | tristate "pinctrl-based I2C multiplexer" | ||
42 | depends on PINCTRL | ||
43 | help | ||
44 | If you say yes to this option, support will be included for an I2C | ||
45 | multiplexer that uses the pinctrl subsystem, i.e. pin multiplexing. | ||
46 | This is useful for SoCs whose I2C module's signals can be routed to | ||
47 | different sets of pins at run-time. | ||
48 | |||
49 | This driver can also be built as a module. If so, the module will be | ||
50 | called pinctrl-i2cmux. | ||
51 | |||
40 | endmenu | 52 | endmenu |