diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-19 13:35:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-19 13:35:09 -0800 |
commit | 50d438fb9e4229cb37ec89a22c066b626e30885c (patch) | |
tree | 30a68ca0fd190054f6c0b61b46c433ce161115d8 /drivers/i2c/Kconfig | |
parent | dce9ce3615ca03bd7adb09a182b5ee192684f17f (diff) | |
parent | ad092de60f865c1ad94221bd06d381ecea446cc8 (diff) | |
download | lwn-50d438fb9e4229cb37ec89a22c066b626e30885c.tar.gz lwn-50d438fb9e4229cb37ec89a22c066b626e30885c.zip |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Some I2C driver bugfixes (and one documentation fix)"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: i2c-mux-pca954x: fix deselect enabling for device-tree
i2c: digicolor: use clk_disable_unprepare instead of clk_unprepare
i2c: mux: fix up dependencies
i2c: Documentation: i2c-topology: fix minor whitespace nit
i2c: mux: demux-pinctrl: make drivers with no pinctrl work again
Diffstat (limited to 'drivers/i2c/Kconfig')
-rw-r--r-- | drivers/i2c/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index d223650a97e4..11edabf425ae 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -59,7 +59,6 @@ config I2C_CHARDEV config I2C_MUX tristate "I2C bus multiplexing support" - depends on HAS_IOMEM help Say Y here if you want the I2C core to support the ability to handle multiplexed I2C bus topologies, by presenting each |