i2c-voodoo3: Deprecate in favor of tdfxfb

[safe/jmp/linux-2.6] / drivers / i2c / busses / Kconfig

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index acadbc5..a48c8ae 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -97,6 +97,7 @@ config I2C_I801
            ICH9
            Tolapai
            ICH10
+           PCH
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
@@ -131,6 +132,7 @@ config I2C_PIIX4
            Serverworks CSB5
            Serverworks CSB6
            Serverworks HT-1000
+           Serverworks HT-1100
            SMSC Victory66
 
          This driver can also be built as a module.  If so, the module
@@ -354,6 +356,16 @@ config I2C_IBM_IIC
          This driver can also be built as a module.  If so, the module
          will be called i2c-ibm_iic.
 
+config I2C_IMX
+       tristate "IMX I2C interface"
+       depends on ARCH_MXC
+       help
+         Say Y here if you want to use the IIC bus controller on
+         the Freescale i.MX/MXC processors.
+
+         This driver can also be built as a module.  If so, the module
+         will be called i2c-imx.
+
 config I2C_IOP3XX
        tristate "Intel IOPx3xx and IXP4xx on-chip I2C interface"
        depends on ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || ARCH_IOP13XX
@@ -460,6 +472,16 @@ config I2C_S3C2410
          Say Y here to include support for I2C controller in the
          Samsung S3C2410 based System-on-Chip devices.
 
+config I2C_S6000
+       tristate "S6000 I2C support"
+       depends on XTENSA_VARIANT_S6000
+       help
+         This driver supports the on chip I2C device on the
+         S6000 xtensa processor family.
+
+         To compile this driver as a module, choose M here. The module
+         will be called i2c-s6000.
+
 config I2C_SH7760
        tristate "Renesas SH7760 I2C Controller"
        depends on CPU_SUBTYPE_SH7760
@@ -582,12 +604,14 @@ comment "Graphics adapter I2C/DDC channel drivers"
        depends on PCI
 
 config I2C_VOODOO3
-       tristate "Voodoo 3"
+       tristate "Voodoo 3 (DEPRECATED)"
        depends on PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the
-         Voodoo 3 I2C interface.
+         Voodoo 3 I2C interface. This driver is deprecated and you should
+         use the tdfxfb driver instead, which additionally provides
+         framebuffer support.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-voodoo3.
@@ -616,12 +640,12 @@ config I2C_ELEKTOR
          will be called i2c-elektor.
 
 config I2C_PCA_ISA
-       tristate "PCA9564 on an ISA bus"
+       tristate "PCA9564/PCA9665 on an ISA bus"
        depends on ISA
        select I2C_ALGOPCA
        default n
        help
-         This driver supports ISA boards using the Philips PCA9564
+         This driver supports ISA boards using the Philips PCA9564/PCA9665
          parallel bus to I2C bus controller.
 
          This driver can also be built as a module.  If so, the module
@@ -633,11 +657,11 @@ config I2C_PCA_ISA
          time).  If unsure, say N.
 
 config I2C_PCA_PLATFORM
-       tristate "PCA9564 as platform device"
+       tristate "PCA9564/PCA9665 as platform device"
        select I2C_ALGOPCA
        default n
        help
-         This driver supports a memory mapped Philips PCA9564
+         This driver supports a memory mapped Philips PCA9564/PCA9665
          parallel bus to I2C bus controller.
 
          This driver can also be built as a module.  If so, the module