patch-1.3.27 linux/arch/i386/config.in

Next file: linux/drivers/block/README.sbpcd
Previous file: linux/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.26/linux/arch/i386/config.in linux/arch/i386/config.in
@@ -226,13 +226,13 @@
   tristate 'Sony CDU31A/CDU33A CDROM support' CONFIG_CDU31A n
   tristate 'Standard Mitsumi [no XA/Multisession] CDROM support' CONFIG_MCD n
   tristate 'Experimental Mitsumi [XA/MultiSession] support' CONFIG_MCDX n
-  tristate 'Matsushita/Panasonic CDROM support' CONFIG_SBPCD n
+  tristate 'Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support' CONFIG_SBPCD n
   if [ "$CONFIG_SBPCD" = "y" ]; then
-    bool 'Matsushita/Panasonic second CDROM controller support' CONFIG_SBPCD2 n
+    bool 'Matsushita/Panasonic, ... second CDROM controller support' CONFIG_SBPCD2 n
     if [ "$CONFIG_SBPCD2" = "y" ]; then
-      bool 'Matsushita/Panasonic third CDROM controller support' CONFIG_SBPCD3 n
+      bool 'Matsushita/Panasonic, ... third CDROM controller support' CONFIG_SBPCD3 n
       if [ "$CONFIG_SBPCD3" = "y" ]; then
-        bool 'Matsushita/Panasonic fourth CDROM controller support' CONFIG_SBPCD4 n
+        bool 'Matsushita/Panasonic, ... fourth CDROM controller support' CONFIG_SBPCD4 n
       fi
     fi
   fi
@@ -266,6 +266,11 @@
 comment 'character devices'
 
 bool 'Cyclades async mux support' CONFIG_CYCLADES n
+bool 'Stallion multiport serial support' CONFIG_STALDRV n
+if [ "$CONFIG_STALDRV" = "y" ]; then
+  tristate '  Stallion EasyIO or EC8/32 support' CONFIG_STALLION n
+  tristate '  Stallion EC8/64, ONboard, Brumby support' CONFIG_ISTALLION n
+fi
 tristate 'Parallel printer support' CONFIG_PRINTER n
 tristate 'Logitech busmouse support' CONFIG_BUSMOUSE n
 tristate 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE n

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this