Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

[sfrench/cifs-2.6.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index e9df4612b7ebc9710db24290b159b4bd77d5d625..bdca5111eb9de406e685c62315fb67a59bf5cecc 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -337,6 +337,16 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
        help
          The unit of the TWI clock is kHz.
 
+config I2C_CBUS_GPIO
+       tristate "CBUS I2C driver"
+       depends on GENERIC_GPIO
+       help
+         Support for CBUS access using I2C API. Mostly relevant for Nokia
+         Internet Tablets (770, N800 and N810).
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-cbus-gpio.
+
 config I2C_CPM
        tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)"
        depends on (CPM1 || CPM2) && OF_I2C
@@ -818,6 +828,16 @@ config I2C_TINY_USB
          This driver can also be built as a module.  If so, the module
          will be called i2c-tiny-usb.
 
+config I2C_VIPERBOARD
+       tristate "Viperboard I2C master support"
+       depends on MFD_VIPERBOARD && USB
+       help
+         Say yes here to access the I2C part of the Nano River
+         Technologies Viperboard as I2C master.
+          See viperboard API specification and Nano
+          River Tech's viperboard.h for detailed meaning
+          of the module parameters.
+
 comment "Other I2C/SMBus bus drivers"
 
 config I2C_ACORN