2 files changed, 20 insertions, 4 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index fb51d38e8b46..878ca34844e4 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -308,3 +308,10 @@ Why:	This driver has been marked obsolete for many years.
 Who:    Stephen Hemminger <shemminger@linux-foundation.org>
 
 ---------------------------
+
+What:   i2c-i810, i2c-prosavage and i2c-savage4
+When:   May 2008
+Why:    These drivers are superseded by i810fb, intelfb and savagefb.
+Who:    Jean Delvare <khali@linux-fr.org>
+
+---------------------------
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2cef92a0bd0e..a38ba04fe36e 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.
 
@@ -382,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
@@ -393,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.
 
@@ -404,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.