patch-2.3.49 linux/drivers/video/Config.in

• Lines: 26
• Date: Tue Feb 29 11:07:04 2000
• Orig file: v2.3.48/linux/drivers/video/Config.in
• Orig date: Sat Feb 26 22:31:50 2000

diff -u --recursive --new-file v2.3.48/linux/drivers/video/Config.in linux/drivers/video/Config.in
@@ -11,7 +11,7 @@
    define_bool CONFIG_DUMMY_CONSOLE y
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       if [ "$CONFIG_PCI" = "y" ]; then
-         bool '  nVidia Riva support (EXPERIMENTAL)' CONFIG_FB_RIVA
+         tristate '  nVidia Riva support (EXPERIMENTAL)' CONFIG_FB_RIVA
       fi
       if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_PCI" = "y" ]; then
 	 tristate '  Cirrus Logic support (EXPERIMENTAL)' CONFIG_FB_CLGEN
@@ -105,10 +105,12 @@
 	    bool '    Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM
 	    bool '    Mystique support' CONFIG_FB_MATROX_MYSTIQUE
 	    bool '    G100/G200/G400 support' CONFIG_FB_MATROX_G100
-	    dep_tristate '      Matrox I2C support' CONFIG_FB_MATROX_I2C $CONFIG_FB_MATROX $CONFIG_I2C_ALGOBIT
-	    if [ "$CONFIG_FB_MATROX_G100" = "y" ]; then
-	       dep_tristate '      G400 second head support' CONFIG_FB_MATROX_MAVEN $CONFIG_FB_MATROX_I2C
-	    fi
+            if [ "$CONFIG_I2C" != "n" ]; then
+	       dep_tristate '      Matrox I2C support' CONFIG_FB_MATROX_I2C $CONFIG_FB_MATROX $CONFIG_I2C_ALGOBIT
+	       if [ "$CONFIG_FB_MATROX_G100" = "y" ]; then
+	          dep_tristate '      G400 second head support' CONFIG_FB_MATROX_MAVEN $CONFIG_FB_MATROX_I2C
+	       fi
+            fi
 	    bool '    Multihead support' CONFIG_FB_MATROX_MULTIHEAD
 	 fi
 	 tristate '  ATI Mach64 display support (EXPERIMENTAL)' CONFIG_FB_ATY