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.