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

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 73e2e7db2b64e061d94da6aca141fdceae88f7d1..dc6dea614abd68dca0e32f7d6948b9c8e40696ef 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -108,6 +108,7 @@ config I2C_I801
            Lynx Point-LP (PCH)
            Avoton (SOC)
            Wellsburg (PCH)
+           Coleto Creek (PCH)
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -150,6 +151,7 @@ config I2C_PIIX4
            ATI SB700/SP5100
            ATI SB800
            AMD Hudson-2
+           AMD CZ
            Serverworks OSB4
            Serverworks CSB5
            Serverworks CSB6
@@ -474,16 +476,6 @@ config I2C_IMX
          This driver can also be built as a module.  If so, the module
          will be called i2c-imx.
 
-config I2C_INTEL_MID
-       tristate "Intel Moorestown/Medfield Platform I2C controller"
-       depends on PCI
-       help
-         Say Y here if you have an Intel Moorestown/Medfield platform I2C
-         controller.
-
-         This support is also available as a module. If so, the module
-         will be called i2c-intel-mid.
-
 config I2C_IOP3XX
        tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
        depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
@@ -494,6 +486,16 @@ config I2C_IOP3XX
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
 
+config I2C_KEMPLD
+       tristate "Kontron COM I2C Controller"
+       depends on MFD_KEMPLD
+       help
+         This enables support for the I2C bus interface on some Kontron ETX
+         and COMexpress (ETXexpress) modules.
+
+         This driver can also be built as a module. If so, the module
+         will be called i2c-kempld.
+
 config I2C_MPC
        tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
        depends on PPC
@@ -507,10 +509,11 @@ config I2C_MPC
 
 config I2C_MV64XXX
        tristate "Marvell mv64xxx I2C Controller"
-       depends on (MV64X60 || PLAT_ORION)
+       depends on (MV64X60 || PLAT_ORION || ARCH_SUNXI)
        help
          If you say yes to this option, support will be included for the
          built-in I2C interface on the Marvell 64xxx line of host bridges.
+         This driver is also used for Allwinner SoCs I2C controllers.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-mv64xxx.
@@ -724,9 +727,19 @@ config I2C_VERSATILE
          This driver can also be built as a module.  If so, the module
          will be called i2c-versatile.
 
+config I2C_WMT
+       tristate "Wondermedia WM8xxx SoC I2C bus support"
+       depends on ARCH_VT8500
+       help
+         Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
+         SoCs.
+
+         This driver can also be built as a module. If so, the module will be
+         called i2c-wmt.
+
 config I2C_OCTEON
        tristate "Cavium OCTEON I2C bus support"
-       depends on CPU_CAVIUM_OCTEON
+       depends on CAVIUM_OCTEON_SOC
        help
          Say yes if you want to support the I2C serial bus on Cavium
          OCTEON SOC.