Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[~andy/linux] / drivers / i2c / muxes / Kconfig

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 40062ed83f37884ac2ff59a001ba675d7f28c1b9..f7f9865b8b898864d4d711ada8bb8591ce289529 100644 (file)
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -5,6 +5,18 @@
 menu "Multiplexer I2C Chip support"
        depends on I2C_MUX
 
+config I2C_ARB_GPIO_CHALLENGE
+       tristate "GPIO-based I2C arbitration"
+       depends on GPIOLIB && OF
+       help
+         If you say yes to this option, support will be included for an
+         I2C multimaster arbitration scheme using GPIOs and a challenge &
+         response mechanism where masters have to claim the bus by asserting
+         a GPIO.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-arb-gpio-challenge.
+
 config I2C_MUX_GPIO
        tristate "GPIO-based I2C multiplexer"
        depends on GPIOLIB