[2.4 patch] simplify PARPORT_PC_PCMCIA dependencies

Adrian Bunk
2004-01-12T02:10:57Z

On Wed, Dec 31, 2003 at 04:26:43PM +0100, Andreas Haumer wrote:

> Hi!

Hi Andreas!

>...
> Here's a first report:
>...
> - Double (but deactivated) entry in config dialog for
> + "Parallel port support" / "Support for PCMCIA management for PC-stype ports"
>...

Thanks for this report.

The patch below fixes this issue, and as a side effect it's also a great
simplification (while remaining semantically equivalent with the
original dependencies).

cu
Adrian

--- linux-2.4.25-pre4-full/drivers/parport/Config.in.old 2004-01-12 02:51:25.000000000 +0100
+++ linux-2.4.25-pre4-full/drivers/parport/Config.in 2004-01-12 03:00:50.000000000 +0100
@@ -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_PCMCIA $CONFIG_PARPORT_PC $CONFIG_HOTPLUG
fi
if [ "$CONFIG_ARM" = "y" ]; then
dep_tristate ' Archimedes hardware' CONFIG_PARPORT_ARC $CONFIG_PARPORT