tdfxfb: move I2C functionality into the tdfxfb

The I2C functionality provided by the i2c-voodoo3 driver is moved into the
tdfxfb (frame buffer driver for Voodoo3 cards).  This way there is no
conflict between the i2c driver and the fb driver.

The tdfxfb does not make use from the DDC functionality yet but provides
all the functionality of the i2c-voodoo3 driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index ffe2f2796e29..7826bdce4bbe 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1550,6 +1550,7 @@ config FB_3DFX
         select FB_CFB_IMAGEBLIT
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
+        select FB_MODE_HELPERS
         help
           This driver supports graphics boards with the 3Dfx Banshee,
           Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have
@@ -1565,6 +1566,14 @@ config FB_3DFX_ACCEL
         This will compile the 3Dfx Banshee/Voodoo3/VSA-100 frame buffer
         device driver with acceleration functions.
 
+config FB_3DFX_I2C
+        bool "Enable DDC/I2C support"
+        depends on FB_3DFX && EXPERIMENTAL
+        select FB_DDC
+        default y
+        help
+          Say Y here if you want DDC/I2C support for your 3dfx Voodoo3.
+
 config FB_VOODOO1
         tristate "3Dfx Voodoo Graphics (sst1) support"
         depends on FB && PCI