patch-2.4.0-test6 linux/drivers/video/Config.in

• Lines: 32
• Date: Wed Aug 9 14:11:11 2000
• Orig file: v2.4.0-test5/linux/drivers/video/Config.in
• Orig date: Mon Jul 10 16:47:25 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/video/Config.in linux/drivers/video/Config.in
@@ -30,9 +30,7 @@
    if [ "$CONFIG_ARCH_ACORN" = "y" ]; then
       bool '  Acorn VIDC support' CONFIG_FB_ACORN
    fi
-   if [ "$CONFIG_ARCH_NETWINDER" = "y" ]; then
-      tristate '  Cyber2000 support' CONFIG_FB_CYBER2000
-   fi
+   tristate '  Cyber2000 support' CONFIG_FB_CYBER2000
    if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
       bool '  SA-1100 LCD support' CONFIG_FB_SA1100
    fi
@@ -64,14 +62,12 @@
    fi
    if [ "$CONFIG_PPC" = "y" ]; then
       bool '  Open Firmware frame buffer device support' CONFIG_FB_OF
-      if [ "$CONFIG_FB_OF" = "y" ]; then
-	 bool '    Apple "control" display support' CONFIG_FB_CONTROL
-	 bool '    Apple "platinum" display support' CONFIG_FB_PLATINUM
-	 bool '    Apple "valkyrie" display support' CONFIG_FB_VALKYRIE
-	 bool '    IMS Twin Turbo display support' CONFIG_FB_IMSTT
-	 bool '    Chips 65550 display support' CONFIG_FB_CT65550
-	 bool '    S3 Trio display support' CONFIG_FB_S3TRIO
-      fi
+      bool '  Apple "control" display support' CONFIG_FB_CONTROL
+      bool '  Apple "platinum" display support' CONFIG_FB_PLATINUM
+      bool '  Apple "valkyrie" display support' CONFIG_FB_VALKYRIE
+      bool '  Chips 65550 display support' CONFIG_FB_CT65550
+      bool '  IMS Twin Turbo display support' CONFIG_FB_IMSTT
+      bool '  S3 Trio display support' CONFIG_FB_S3TRIO
       tristate '  VGA 16-color graphics console' CONFIG_FB_VGA16
    fi
    if [ "$CONFIG_MAC" = "y" ]; then