patch-2.3.31 linux/drivers/char/Config.in

• Lines: 57
• Date: Tue Dec 7 16:22:34 1999
• Orig file: v2.3.30/linux/drivers/char/Config.in
• Orig date: Tue Dec 7 09:32:43 1999

diff -u --recursive --new-file v2.3.30/linux/drivers/char/Config.in linux/drivers/char/Config.in
@@ -82,6 +82,8 @@
 fi
 endmenu
 
+source drivers/char/joystick/Config.in
+
 tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
 if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
    bool '  Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
@@ -141,7 +143,6 @@
    fi
    if [ "$CONFIG_PCI" != "n" ]; then
       dep_tristate '  BT848 Video For Linux' CONFIG_VIDEO_BT848 $CONFIG_VIDEO_DEV
-	dep_tristate 'Zoran ZR36120/36125 support' CONFIG_VIDEO_ZR36120 $CONFIG_VIDEO_DEV
    fi
    dep_tristate '  GemTek Radio Card support' CONFIG_RADIO_GEMTEK $CONFIG_VIDEO_DEV
    if [ "$CONFIG_RADIO_GEMTEK" = "y" ]; then
@@ -200,15 +201,6 @@
 
 endmenu
 
-mainmenu_option next_comment
-comment 'Joystick support'
-
-tristate 'Joystick support' CONFIG_JOYSTICK
-if [ "$CONFIG_JOYSTICK" != "n" ]; then
-   source drivers/char/joystick/Config.in
-fi
-endmenu
-
 tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
 
 tristate 'Siemens R3964 line discipline' CONFIG_R3964
@@ -224,6 +216,7 @@
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    bool 'Direct Rendering Manager (XFree86 DRI support) (EXPERIMENTAL)' 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
    fi
@@ -233,4 +226,15 @@
    source drivers/char/pcmcia/Config.in
 fi
 
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+   dep_tristate '/dev/agpgart (AGP Support) (EXPERIMENTAL)' CONFIG_AGP m
+   if [ "$CONFIG_AGP" = "m" ]; then
+     bool '   Intel 440LX/BX/GX support' CONFIG_AGP_INTEL
+     bool '   Intel I810/I810 DC100/I810e support' CONFIG_AGP_I810
+     bool '   VIA VP3/MVP3/Apollo Pro 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