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

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

diff -u --recursive --new-file v2.4.2/linux/drivers/char/pcmcia/Config.in linux/drivers/char/pcmcia/Config.in
@@ -2,29 +2,13 @@
 # PCMCIA character device configuration
 #
 
-if [ "$CONFIG_SERIAL" = "n" ]; then
-   define_tristate CONFIG_PCMCIA_SERIAL n
-else
-   if [ "$CONFIG_SERIAL" = "m" -o "$CONFIG_PCMCIA" = "m" ]; then
-      define_tristate CONFIG_PCMCIA_SERIAL m
-   else
-      define_tristate CONFIG_PCMCIA_SERIAL y
-   fi
-fi
-
-if [ "$CONFIG_PCMCIA_SERIAL" != "n" ]; then
-   mainmenu_option next_comment
-   comment 'PCMCIA character device support'
+mainmenu_option next_comment
+comment 'PCMCIA character devices'
 
-   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
+dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_SERIAL
+if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" ]; then
+   define_bool CONFIG_PCMCIA_CHRDEV y
+fi
 
-   if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" -o \
-        "$CONFIG_PCMCIA_SERIAL_CB" = "y" ]; then
-      define_bool CONFIG_PCMCIA_CHRDEV y
-   fi
+endmenu
 
-   endmenu
-fi

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