[2.4 patch] simplify COMX_PROTO_LAPB dependencies

[Adrian Bunk]

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
>...
>      + "Wan Interfaces" / "Support for LAPB protocol on MultiGate boards"
>...

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/net/wan/Config.in.old	2004-01-13 01:48:47.000000000 +0100
+++ linux-2.4.25-pre4-full/drivers/net/wan/Config.in	2004-01-13 01:49:51.000000000 +0100
@@ -30,12 +30,7 @@
       dep_tristate '    Support for MixCOM board' CONFIG_COMX_HW_MIXCOM $CONFIG_COMX
       dep_tristate '    Support for MUNICH based boards: SliceCOM, PCICOM (WelCOM)' CONFIG_COMX_HW_MUNICH $CONFIG_COMX
       dep_tristate '    Support for HDLC and syncPPP protocols on MultiGate boards' CONFIG_COMX_PROTO_PPP $CONFIG_COMX
-      if [ "$CONFIG_LAPB" = "y" ]; then
-	 dep_tristate '    Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_COMX
-      fi
-      if [ "$CONFIG_LAPB" = "m" ]; then
-	 dep_tristate '    Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_LAPB
-      fi
+      dep_tristate '    Support for LAPB protocol on MultiGate boards' CONFIG_COMX_PROTO_LAPB $CONFIG_LAPB $CONFIG_COMX
       dep_tristate '    Support for Frame Relay on MultiGate boards' CONFIG_COMX_PROTO_FR $CONFIG_COMX
    fi
 
-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html