* [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd)
@ 2003-12-12 22:26 Adrian Bunk
2003-12-12 22:34 ` Jeff Garzik
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2003-12-12 22:26 UTC (permalink / raw)
To: Marcelo Tosatti
Cc: jgarzik, linux-net, linux-kernel, Rik van Riel, linux-tr, jschlst,
cgoos, mid, phillim, jochen
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 <riel@surriel.com> -----
Date: Mon, 13 Oct 2003 11:10:36 -0400 (EDT)
From: Rik van Riel <riel@surriel.com>
To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>
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.
diff -urNp linux-5110/drivers/net/tokenring/Config.in linux-10010/drivers/net/tokenring/Config.in
--- linux-5110/drivers/net/tokenring/Config.in
+++ linux-10010/drivers/net/tokenring/Config.in
@@ -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 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/
----- End forwarded message -----
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd)
2003-12-12 22:26 [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd) Adrian Bunk
@ 2003-12-12 22:34 ` Jeff Garzik
2003-12-12 22:53 ` Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2003-12-12 22:34 UTC (permalink / raw)
To: Adrian Bunk
Cc: Marcelo Tosatti, linux-net, linux-kernel, Rik van Riel, linux-tr,
jschlst, cgoos, mid, phillim, jochen
Adrian Bunk wrote:
> 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 :)
> ----- Forwarded message from Rik van Riel <riel@surriel.com> -----
>
> Date: Mon, 13 Oct 2003 11:10:36 -0400 (EDT)
> From: Rik van Riel <riel@surriel.com>
> To: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
> Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>
> 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.
>
> diff -urNp linux-5110/drivers/net/tokenring/Config.in linux-10010/drivers/net/tokenring/Config.in
> --- linux-5110/drivers/net/tokenring/Config.in
> +++ linux-10010/drivers/net/tokenring/Config.in
> @@ -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
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd)
2003-12-12 22:34 ` Jeff Garzik
@ 2003-12-12 22:53 ` Adrian Bunk
2003-12-19 7:02 ` Jeff Garzik
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2003-12-12 22:53 UTC (permalink / raw)
To: Jeff Garzik
Cc: Marcelo Tosatti, linux-net, linux-kernel, Rik van Riel, linux-tr,
jschlst, cgoos, mid, jochen
On Fri, Dec 12, 2003 at 05:34:19PM -0500, Jeff Garzik wrote:
>...
> >--- linux-5110/drivers/net/tokenring/Config.in
> >+++ linux-10010/drivers/net/tokenring/Config.in
> >@@ -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 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.
Consider:
CONFIG_TMS380TR=m
E.g. CONFIG_TMSPCI=y shouldn't be allowed in this case.
> Jeff
cu
Adrian
--
"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 Seed
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd)
2003-12-12 22:53 ` Adrian Bunk
@ 2003-12-19 7:02 ` Jeff Garzik
2003-12-21 2:35 ` Adrian Bunk
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2003-12-19 7:02 UTC (permalink / raw)
To: Adrian Bunk
Cc: Marcelo Tosatti, linux-net, linux-kernel, Rik van Riel, linux-tr,
jschlst, cgoos, mid, jochen
Adrian Bunk wrote:
> On Fri, Dec 12, 2003 at 05:34:19PM -0500, Jeff Garzik wrote:
>
>>...
>>
>>>--- linux-5110/drivers/net/tokenring/Config.in
>>>+++ linux-10010/drivers/net/tokenring/Config.in
>>>@@ -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 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.
>
>
> Consider:
> CONFIG_TMS380TR=m
>
> E.g. CONFIG_TMSPCI=y shouldn't be allowed in this case.
Remove the 'if' and you are correct :)
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd)
2003-12-19 7:02 ` Jeff Garzik
@ 2003-12-21 2:35 ` Adrian Bunk
2003-12-21 4:17 ` Jeff Garzik
0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2003-12-21 2:35 UTC (permalink / raw)
To: Jeff Garzik
Cc: Marcelo Tosatti, linux-net, linux-kernel, Rik van Riel, linux-tr,
jschlst, cgoos, mid, jochen
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2003-12-21 4:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-12 22:26 [PATCH][TRIVIAL] dep_tristate wants 3 arguments (fwd) Adrian Bunk
2003-12-12 22:34 ` Jeff Garzik
2003-12-12 22:53 ` Adrian Bunk
2003-12-19 7:02 ` Jeff Garzik
2003-12-21 2:35 ` Adrian Bunk
2003-12-21 4:17 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox