[patch] simplify the Config.in for CONFIG_PARPORT_PC_PCMCIA

[patch] simplify the Config.in for CONFIG_PARPORT_PC_PCMCIA

[Adrian Bunk]

Hi,

the current Config.in code for CONFIG_PARPORT_PC_PCMCIA in both
2.4.20-pre9 and 2.5.40 has the disadvantage that "make xconfig" shows two
entries for this option (it's harmless since at most one of them is
selectable at any time). The patch below fixes this. It does an
semantically equivalent transformation with the positive side effect that
it's now more simple.

--- linux/drivers/parport/Config.in.old	2002-10-07 13:21:26.000000000 +0200
+++ linux/drivers/parport/Config.in	2002-10-07 13:35:31.000000000 +0200
@@ -24,13 +24,7 @@
          bool '    Use FIFO/DMA if available (EXPERIMENTAL)' CONFIG_PARPORT_PC_FIFO
          bool '    SuperIO chipset support (EXPERIMENTAL)' CONFIG_PARPORT_PC_SUPERIO
       fi
-      if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
-         if [ "$CONFIG_PARPORT_PC" = "y" ]; then
-            dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_PCMCIA
-         else
-            dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_PARPORT_PC
-         fi
-      fi
+      dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_HOTPLUG $CONFIG_PCMCIA $CONFIG_PARPORT_PC
    fi
    if [ "$CONFIG_ARM" = "y" ]; then
       dep_tristate '  Archimedes hardware' CONFIG_PARPORT_ARC $CONFIG_PARPORT

Please apply
Adrian

Re: [patch] simplify the Config.in for CONFIG_PARPORT_PC_PCMCIA

[Adrian Bunk]

Ups, just noticed that my last patch wasn't correct: dep_tristate ignores
dependencies with an empty value ($%&#$!) and since there are
architectures that do define neither CONFIG_HOTPLUG nor CONFIG_PCMCIA the
following is the correct patch:


--- drivers/parport/Config.in.old	Mon Aug  5 10:32:28 2002
+++ drivers/parport/Config.in	Mon Aug  5 10:40:03 2002
@@ -24,12 +24,8 @@
          bool '    Use FIFO/DMA if available (EXPERIMENTAL)' CONFIG_PARPORT_PC_FIFO
          bool '    SuperIO chipset support (EXPERIMENTAL)' CONFIG_PARPORT_PC_SUPERIO
       fi
-      if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
-         if [ "$CONFIG_PARPORT_PC" = "y" ]; then
-            dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_PCMCIA
-         else
-            dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_PARPORT_PC
-         fi
+      if [ "$CONFIG_HOTPLUG" = "y" ]; then
+         dep_tristate '    Support for PCMCIA management for PC-style ports' CONFIG_PARPORT_PC_PCMCIA $CONFIG_PCMCIA $CONFIG_PARPORT_PC
       fi
    fi
    if [ "$CONFIG_ARM" = "y" ]; then


cu
Adrian

-- 

You only think this is a free country. Like the US the UK spends a lot of
time explaining its a free country because its a police state.
								Alan Cox