patch-2.4.0-test5 linux/drivers/char/Config.in

• Lines: 36
• Date: Thu Jul 27 15:05:40 2000
• Orig file: v2.4.0-test4/linux/drivers/char/Config.in
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/Config.in linux/drivers/char/Config.in
@@ -257,25 +257,19 @@
 fi
 endmenu
 
-bool 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM
-dep_tristate '  3dfx Banshee/Voodoo3' CONFIG_DRM_TDFX $CONFIG_DRM
-if [ "$CONFIG_DRM" = "y" ]; then
-  dep_tristate '  3dlabs GMX 2000' CONFIG_DRM_GAMMA m
+tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
+if [ "$CONFIG_AGP" != "n" ]; then
+   bool '  Intel 440LX/BX/GX support' CONFIG_AGP_INTEL
+   bool '  Intel I810/I810 DC100/I810e support' CONFIG_AGP_I810
+   bool '  VIA chipset support' CONFIG_AGP_VIA
+   bool '  AMD Irongate support' CONFIG_AGP_AMD
+   bool '  Generic SiS support' CONFIG_AGP_SIS
+   bool '  ALI M1541 support' CONFIG_AGP_ALI
 fi
 
+source drivers/char/drm/Config.in
+
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/char/pcmcia/Config.in
-fi
-
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   tristate '/dev/agpgart (AGP Support) (EXPERIMENTAL)' CONFIG_AGP
-   if [ "$CONFIG_AGP" != "n" ]; then
-      bool '  Intel 440LX/BX/GX support' CONFIG_AGP_INTEL
-      bool '  Intel I810/I810 DC100/I810e support' CONFIG_AGP_I810
-      bool '  VIA chipset support' CONFIG_AGP_VIA
-      bool '  AMD Irongate support' CONFIG_AGP_AMD
-      bool '  Generic SiS support' CONFIG_AGP_SIS
-      bool '  ALI M1541 support' CONFIG_AGP_ALI
-   fi
 fi
 endmenu