1 files changed, 14 insertions, 19 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b148bf0ec6b7..b61f56b6f311 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,7 +182,8 @@ config I2C_I801
           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 +196,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 +262,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 +385,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 +397,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 +410,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 +606,7 @@ config I2C_VIAPRO
             VT8231
             VT8233/A
             VT8235
-            VT8237R/A
+            VT8237R/A/S
             VT8251
             CX700