patch-2.3.40 linux/drivers/char/pcmcia/Config.in

Next file: linux/drivers/char/pcmcia/serial_cb.c
Previous file: linux/drivers/char/mxser.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/drivers/char/pcmcia/Config.in linux/drivers/char/pcmcia/Config.in
@@ -2,10 +2,7 @@
 # PCMCIA character device configuration
 #
 
-mainmenu_option next_comment
-comment 'PCMCIA character device support'
-
-if [ "$CONFIG_SERIAL" = "n" -o "$CONFIG_PCMCIA" = "n" ]; then
+if [ "$CONFIG_SERIAL" = "n" ]; then
    define_bool CONFIG_PCMCIA_SERIAL n
 else
    if [ "$CONFIG_SERIAL" = "m" -o "$CONFIG_PCMCIA" = "m" ]; then
@@ -15,14 +12,19 @@
    fi
 fi
 
-dep_tristate '  PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA_SERIAL
-if [ "$CONFIG_CARDBUS" = "y" ]; then
-   dep_tristate '  CardBus serial device support' CONFIG_PCMCIA_SERIAL_CB $CONFIG_PCMCIA_SERIAL
-fi
+if [ "$CONFIG_PCMCIA_SERIAL" != "n" ]; then
+   mainmenu_option next_comment
+   comment 'PCMCIA character device support'
 
-if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" -o \
-     "$CONFIG_PCMCIA_SERIAL_CB" = "y" ]; then
-   define_bool CONFIG_PCMCIA_CHRDEV y
-fi
+   dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA_SERIAL
+   if [ "$CONFIG_CARDBUS" = "y" ]; then
+      dep_tristate 'CardBus serial device support' CONFIG_PCMCIA_SERIAL_CB $CONFIG_PCMCIA_SERIAL
+   fi
 
-endmenu
+   if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" -o \
+        "$CONFIG_PCMCIA_SERIAL_CB" = "y" ]; then
+      define_bool CONFIG_PCMCIA_CHRDEV y
+   fi
+
+   endmenu
+fi

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)