i2c-stu300: Make driver depend on MACH_U300

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 5d4aa5e..3c259ee 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -211,7 +211,7 @@ config I2C_VIA
          will be called i2c-via.
 
 config I2C_VIAPRO
-       tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"
+       tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"
        depends on PCI
        help
          If you say yes to this option, support will be included for the VIA
@@ -225,8 +225,8 @@ config I2C_VIAPRO
            VT8237R/A/S
            VT8251
            CX700
-           VX800
-           VX820
+           VX800/VX820
+           VX855/VX875
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.
@@ -298,7 +298,7 @@ config I2C_BLACKFIN_TWI
 config I2C_BLACKFIN_TWI_CLK_KHZ
        int "Blackfin TWI I2C clock (kHz)"
        depends on I2C_BLACKFIN_TWI
-       range 10 400
+       range 21 400
        default 50
        help
          The unit of the TWI clock is kHz.
@@ -467,11 +467,21 @@ config I2C_PXA_SLAVE
 
 config I2C_S3C2410
        tristate "S3C2410 I2C Driver"
-       depends on ARCH_S3C2410
+       depends on ARCH_S3C2410 || ARCH_S3C64XX
        help
          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
@@ -503,6 +513,19 @@ config I2C_SIMTEC
          This driver can also be built as a module. If so, the module
          will be called i2c-simtec.
 
+config I2C_STU300
+       tristate "ST Microelectronics DDC I2C interface"
+       depends on MACH_U300
+       default y if MACH_U300
+       help
+         If you say yes to this option, support will be included for the
+         I2C interface from ST Microelectronics simply called "DDC I2C"
+         supporting both I2C and DDC, used in e.g. the U300 series
+         mobile platforms.
+
+         This driver can also be built as a module. If so, the module
+         will be called i2c-stu300.
+
 config I2C_VERSATILE
        tristate "ARM Versatile/Realview I2C bus support"
        depends on ARCH_VERSATILE || ARCH_REALVIEW
@@ -594,12 +617,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.