summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-04-13 17:02:13 +0200
committerJean Delvare <khali@linux-fr.org>2009-04-13 17:02:13 +0200
commit3f307fb37a6dd65b7eabda9c6208a9bd161dc16e (patch)
treea097ee54792ecd396a5a87b1095f47c0895b8b8d
parentc454dee21d589476608957ca4f57feaabde62fab (diff)
downloadkernel-crypto-3f307fb37a6dd65b7eabda9c6208a9bd161dc16e.tar.gz
kernel-crypto-3f307fb37a6dd65b7eabda9c6208a9bd161dc16e.tar.xz
kernel-crypto-3f307fb37a6dd65b7eabda9c6208a9bd161dc16e.zip
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>
-rw-r--r--Documentation/feature-removal-schedule.txt9
-rw-r--r--drivers/i2c/busses/Kconfig6
2 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 7e2af10e826..de491a3e231 100644
--- 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 94eae5c3cbc..a48c8aee021 100644
--- 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.