Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index c466c6cfc2e53512c402f2eae138c625a1fb1e69..b04c99580d0dc167fee9f1b99dc812eacc5c3965 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -100,7 +100,7 @@ config I2C_AU1550
 
 config I2C_BLACKFIN_TWI
        tristate "Blackfin TWI I2C support"
-       depends on BF534 || BF536 || BF537 || BF54x
+       depends on BF534 || BF536 || BF537
        help
          This is the TWI I2C device driver for Blackfin 534/536/537/54x.
          This driver can also be built as a module.  If so, the module
@@ -177,12 +177,15 @@ config I2C_I801
            ESB2
            ICH8
            ICH9
+           Tolapai
+           ICH10
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
 
 config I2C_I810
-       tristate "Intel 810/815"
+       tristate "Intel 810/815 (DEPRECATED)"
+       default n
        depends on PCI
        select I2C_ALGOBIT
        help
@@ -195,6 +198,8 @@ config I2C_I810
            i815
            i845G
 
+         This driver is deprecated in favor of the i810fb and intelfb drivers.
+
          This driver can also be built as a module.  If so, the module
          will be called i2c-i810.
 
@@ -259,20 +264,6 @@ config I2C_IOP3XX
          This driver can also be built as a module.  If so, the module
          will be called i2c-iop3xx.
 
-config I2C_IXP4XX
-       tristate "IXP4xx GPIO-Based I2C Interface (DEPRECATED)"
-       depends on ARCH_IXP4XX
-       select I2C_ALGOBIT
-       help
-         Say Y here if you have an Intel IXP4xx(420,421,422,425) based 
-         system and are using GPIO lines for an I2C bus.
-
-         This support is also available as a module. If so, the module
-         will be called i2c-ixp4xx.
-
-         This driver is deprecated and will be dropped soon. Use i2c-gpio
-         instead.
-
 config I2C_IXP2000
        tristate "IXP2000 GPIO-Based I2C Interface (DEPRECATED)"
        depends on ARCH_IXP2000
@@ -396,7 +387,8 @@ config I2C_PASEMI
          Supports the PA Semi PWRficient on-chip SMBus interfaces.
 
 config I2C_PROSAVAGE
-       tristate "S3/VIA (Pro)Savage"
+       tristate "S3/VIA (Pro)Savage (DEPRECATED)"
+       default n
        depends on PCI
        select I2C_ALGOBIT
        help
@@ -407,6 +399,8 @@ config I2C_PROSAVAGE
            S3/VIA KM266/VT8375 aka ProSavage8
            S3/VIA KM133/VT8365 aka Savage4
 
+         This driver is deprecated in favor of the savagefb driver.
+
          This support is also available as a module.  If so, the module 
          will be called i2c-prosavage.
 
@@ -418,13 +412,16 @@ config I2C_S3C2410
          Samsung S3C2410 based System-on-Chip devices.
 
 config I2C_SAVAGE4
-       tristate "S3 Savage 4"
-       depends on PCI && EXPERIMENTAL
+       tristate "S3 Savage 4 (DEPRECATED)"
+       default n
+       depends on PCI
        select I2C_ALGOBIT
        help
          If you say yes to this option, support will be included for the 
          S3 Savage 4 I2C interface.
 
+         This driver is deprecated in favor of the savagefb driver.
+
          This driver can also be built as a module.  If so, the module
          will be called i2c-savage4.
 
@@ -611,7 +608,7 @@ config I2C_VIAPRO
            VT8231
            VT8233/A
            VT8235
-           VT8237R/A
+           VT8237R/A/S
            VT8251
            CX700
 
@@ -648,7 +645,7 @@ config I2C_PCA_ISA
 
 config I2C_MV64XXX
        tristate "Marvell mv64xxx I2C Controller"
-       depends on MV64X60 && EXPERIMENTAL
+       depends on (MV64X60 || PLAT_ORION) && EXPERIMENTAL
        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.