Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-microblaze.git] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index db09881..2255af2 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -583,6 +583,15 @@ config I2C_IOP3XX
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
 
+config I2C_JZ4780
+       tristate "JZ4780 I2C controller interface support"
+       depends on MACH_JZ4780 || COMPILE_TEST
+       help
+        If you say yes to this option, support will be included for the
+        Ingenic JZ4780 I2C controller.
+
+        If you don't know what to do here, say N.
+
 config I2C_KEMPLD
        tristate "Kontron COM I2C Controller"
        depends on MFD_KEMPLD
@@ -907,6 +916,16 @@ config I2C_XLR
          This driver can also be built as a module.  If so, the module
          will be called i2c-xlr.
 
+config I2C_XLP9XX
+       tristate "XLP9XX I2C support"
+       depends on CPU_XLP || COMPILE_TEST
+       help
+         This driver enables support for the on-chip I2C interface of
+         the Broadcom XLP9xx/XLP5xx MIPS processors.
+
+         This driver can also be built as a module.  If so, the module will
+         be called i2c-xlp9xx.
+
 config I2C_RCAR
        tristate "Renesas R-Car I2C Controller"
        depends on ARCH_SHMOBILE || COMPILE_TEST