[patch] Re: 2.4.19 duplicate config entry

From: Adrian Bunk (bunk@fs.tum.de)
Date: Mon Aug 05 2002 - 03:45:06 EST


On Sun, 4 Aug 2002 jbradford@dial.pipex.com wrote:

> Hi,

Hi John,

> I've just noticed in 2.4.19, that:
>
> "Support for PCMCIA management for PC-style ports" appears twice in the configuration.
>
> I didn't notice it in 2.4.19-RC2, (the last version I compiled), but I might have missed it.
>
> By the way, I got a 2.4.18 tree, patched it to RC1, then used the incremental patches up to -final.
>
> The second instance is greyed-out in xconfig, and neither allows y, m or n to be selected.

it's at no time possible that more than one choice is available which
means it's harmless.

But you are right, it doesn't look good. IMHO the following more simple
(and semantically equivalent) solution should work and correct it:

--- 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

> John.

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

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Wed Aug 07 2002 - 22:00:26 EST