On Fri, Dec 19, 2003 at 02:02:53AM -0500, Jeff Garzik wrote:
> Adrian Bunk wrote:
> >
> >Consider:
> > CONFIG_TMS380TR=m
> >
> >E.g. CONFIG_TMSPCI=y shouldn't be allowed in this case.
>
>
> Remove the 'if' and you are correct :)
Agreed, the updated patch is below. :-)
> Jeff
cu
Adrian
--- linux-2.4.24-pre1-full/drivers/net/tokenring/Config.in.old 2003-12-21 03:32:12.000000000 +0100
+++ linux-2.4.24-pre1-full/drivers/net/tokenring/Config.in 2003-12-21 03:32:53.000000000 +0100
@@ -20,12 +20,12 @@
dep_tristate ' IBM Lanstreamer chipset PCI adapter support' CONFIG_IBMLS $CONFIG_TR $CONFIG_PCI
dep_tristate ' 3Com 3C359 Token Link Velocity XL adapter support' CONFIG_3C359 $CONFIG_TR $CONFIG_PCI
tristate ' Generic TMS380 Token Ring ISA/PCI adapter support' CONFIG_TMS380TR
- if [ "$CONFIG_TMS380TR" != "n" ]; then
- dep_tristate ' Generic TMS380 PCI support' CONFIG_TMSPCI $CONFIG_PCI
- dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA
- dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI
- dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA
- fi
+
+ dep_tristate ' Generic TMS380 PCI support' CONFIG_TMSPCI $CONFIG_PCI $CONFIG_TMS380TR
+ dep_tristate ' Generic TMS380 ISA support' CONFIG_TMSISA $CONFIG_ISA $CONFIG_TMS380TR
+ dep_tristate ' Madge Smart 16/4 PCI Mk2 support' CONFIG_ABYSS $CONFIG_PCI $CONFIG_TMS380TR
+ dep_tristate ' Madge Smart 16/4 Ringnode MicroChannel' CONFIG_MADGEMC $CONFIG_MCA $CONFIG_TMS380TR
+
if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
tristate ' SMC ISA/MCA adapter support' CONFIG_SMCTR
fi
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
