diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/char/pcmcia/Config.in | |
parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/char/pcmcia/Config.in')
-rw-r--r-- | drivers/char/pcmcia/Config.in | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/char/pcmcia/Config.in b/drivers/char/pcmcia/Config.in index 88545b788..7a32e5d55 100644 --- a/drivers/char/pcmcia/Config.in +++ b/drivers/char/pcmcia/Config.in @@ -5,22 +5,19 @@ mainmenu_option next_comment comment 'PCMCIA character device support' -if [ "$CONFIG_SERIAL" = "y" ]; then - dep_tristate ' PCMCIA serial device support' \ - CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA - if [ "$CONFIG_CARDBUS" = "y" ]; then - dep_tristate ' CardBus serial device support' \ - CONFIG_PCMCIA_SERIAL_CB $CONFIG_PCMCIA +if [ "$CONFIG_SERIAL" = "n" -o "$CONFIG_PCMCIA" = "n" ]; then + define_bool CONFIG_PCMCIA_SERIAL n +else + if [ "$CONFIG_SERIAL" = "m" -o "$CONFIG_PCMCIA" = "m" ]; then + define_bool CONFIG_PCMCIA_SERIAL m + else + define_bool CONFIG_PCMCIA_SERIAL y fi fi -if [ "$CONFIG_SERIAL" = "m" ]; then - dep_tristate ' PCMCIA serial device support' \ - CONFIG_PCMCIA_SERIAL_CS m - if [ "$CONFIG_CARDBUS" = "y" ]; then - dep_tristate ' CardBus serial device support' \ - CONFIG_PCMCIA_SERIAL_CB m - 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_CS" = "y" -o \ |