dep_tristate wants 3 arguments (fwd)
PATCH 1/1 dep_tristate wants 3 arguments (fwd)
Hi Marcelo,
the trivial patch by Rik forwarded below still applies against 2.4.24-pre1.
Please apply
Adrian
----- Forwarded message from Rik van Riel <[email protected]> -----
Date: Mon, 13 Oct 2003 11:10:36 -0400 (EDT)
From: Rik van Riel <[email protected]>
To: Marcelo Tosatti <[email protected]>
Cc: Kernel Mailing List <[email protected]>
Subject: [PATCH][TRIVIAL] dep_tristate wants 3 arguments
The tokenring Config.in has dep_tristate statements with only two arguments. Add the obvious third argument.
drivers/net/tokenring/Config.in +4 -4
@@ -21,10 +21,10 @@ if [ "$CONFIG_TR" != "n" ]; then 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 + 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 fi if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then tristate ' SMC ISA/MCA adapter support' CONFIG_SMCTR
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
----- End forwarded message -----
Quoted 5 lines · Adrian Bunk
Hi Marcelo,
the trivial patch by Rik forwarded below still applies against 2.4.24-pre1.
Please apply
Let's not and say we did :)
Quoted 16 lines
----- Forwarded message from Rik van Riel <[email protected]> -----
Date: Mon, 13 Oct 2003 11:10:36 -0400 (EDT)
From: Rik van Riel <[email protected]>
To: Marcelo Tosatti <[email protected]>
Cc: Kernel Mailing List <[email protected]>
Subject: [PATCH][TRIVIAL]dep_tristatewants 3 argumentsThe tokenring Config.in has
dep_tristatestatements with only two arguments. Add the obvious third argument.diff -urNp linux-5110/drivers/net/tokenring/Config.in linux-10010/drivers/net/tokenring/Config.in
drivers/net/tokenring/Config.in +0
-0@@ -21,10 +21,10 @@ if [ "$CONFIG_TR" != "n" ]; then dep_tristate ' 3Com 3C359 Token Link Velocity XL adapter support' CONFIG_3C359 $CONFIG_TR $CONFIG_PCI
drivers/net/tokenring/Config.in if [ "$CONFIG_TR" != "n" ]; then · line 27
Quoted 10 lines
drivers/net/tokenring/Config.in +4
-4tristate ' 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 + 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
I don't see why this patch is needed.
dep_tristate statements with only three arguments (include desc. text) are just fine. There is no need for additional arguments.
dep_tristate 'blah blah' CONFIG_BLAH dep...
Further, adding CONFIG_TMS380TR dependency is complete nonsense, considering that the "if [ "$CONFIG_TMS380TR" != "n" ]" check remains.
Jeff
Quoted 23 lines · Jeff Garzik
...
Quoted 10 lines
drivers/net/tokenring/Config.in +0
-1@@ -21,10 +21,10 @@ if [ "$CONFIG_TR" != "n" ]; then 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
Quoted 8 lines
-
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
+dep_tristate' Generic TMS380 PCI support'CONFIG_TMSPCI
$CONFIG_PCI $CONFIG_TMS380TR...
dep_tristatestatements with only three arguments (include desc. text) are just fine. There is no need for additional arguments.
Quoted 4 lines
dep_tristate'blah blah'CONFIG_BLAHdep...Further, adding
CONFIG_TMS380TRdependency is complete nonsense, considering that the "if [ "$CONFIG_TMS380TR" != "n" ]" check remains.
Consider:
CONFIG_TMS380TR=m
E.g. CONFIG_TMSPCI=y shouldn't be allowed in this case.
Quoted 1 line
Jeff
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 28 lines · Adrian Bunk
Quoted 26 lines · Jeff Garzik
...
Quoted 10 lines
drivers/net/tokenring/Config.in +0
-1@@ -21,10 +21,10 @@ if [ "$CONFIG_TR" != "n" ]; then 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
Quoted 8 lines
-
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
+dep_tristate' Generic TMS380 PCI support'CONFIG_TMSPCI
$CONFIG_PCI $CONFIG_TMS380TR...
dep_tristatestatements with only three arguments (include desc. text) are just fine. There is no need for additional arguments.
dep_tristate'blah blah'CONFIG_BLAHdep...
Quoted 7 lines
Quoted 1 line
Further, adding
CONFIG_TMS380TRdependency is complete nonsense, considering that the "if [ "$CONFIG_TMS380TR" != "n" ]" check remains.Consider:
CONFIG_TMS380TR=mE.g.
CONFIG_TMSPCI=yshouldn't be allowed in this case.
Remove the 'if' and you are correct :)
Jeff
Quoted 9 lines · Jeff Garzik
Quoted 5 lines · Adrian Bunk
Consider:
CONFIG_TMS380TR=mE.g.
CONFIG_TMSPCI=yshouldn't be allowed in this case.Remove the 'if' and you are correct :)
Agreed, the updated patch is below. :-)
Quoted 1 line
Jeff
cu
Adrian
drivers/net/tokenring/Config.in renamed from drivers/net/tokenring/Config.in.old +6 -6
@@ -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
Jeff Garzik
Appliedapplied to 2.4