Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 230601e8853fff715a23465a507cdc054390d72b..9294dc21861a2bbc2fa8c689ecaa49d409539a78 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -676,6 +676,16 @@ config I2C_EG20T
 
 comment "External I2C/SMBus adapter drivers"
 
+config I2C_DIOLAN_U2C
+       tristate "Diolan U2C-12 USB adapter"
+       depends on USB
+       help
+         If you say yes to this option, support will be included for Diolan
+         U2C-12, a USB to I2C interface.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-diolan-u2c.
+
 config I2C_PARPORT
        tristate "Parallel port adapter"
        depends on PARPORT