i2c-voodoo3: Deprecate in favor of tdfxfb

Support for I2C/DDC was recently added to the tdfxfb driver, which
means that the i2c-voodoo3 driver can be deprecated.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7e2af10e82645570a7ad426bc3e73ea3b6497ea7..de491a3e23131001c7e308e30aa12f8326159f69 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -428,3 +428,12 @@ Why:       In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to
        After a reasonable transition period, we will remove the legacy
        fakephp interface.
 Who:   Alex Chiang <achiang@hp.com>
+
+---------------------------
+
+What:  i2c-voodoo3 driver
+When:  October 2009
+Why:   Superseded by tdfxfb. I2C/DDC support used to live in a separate
+       driver but this caused driver conflicts.
+Who:   Jean Delvare <khali@linux-fr.org>
+       Krzysztof Helt <krzysztof.h1@wp.pl>

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 94eae5c3cbc7d3417d2273569f89164d45efea5b..a48c8aee0218087691236241c782eac8f918759a 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -604,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.