2002-10-02 21:49:19

by Alan Cox

[permalink] [raw]
Subject: PATCH: move tulip into ethernet 10,100

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.40/drivers/net/Config.in linux.2.5.40-ac1/drivers/net/Config.in
--- linux.2.5.40/drivers/net/Config.in 2002-10-02 21:33:55.000000000 +0100
+++ linux.2.5.40-ac1/drivers/net/Config.in 2002-10-02 22:17:39.000000000 +0100
@@ -108,6 +108,9 @@
dep_tristate ' NI5210 support' CONFIG_NI52 $CONFIG_ISA
dep_tristate ' NI6510 support' CONFIG_NI65 $CONFIG_ISA
fi
+ if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_CARDBUS" != "n" ]; then
+ source drivers/net/tulip/Config.in
+ fi
if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
dep_tristate ' AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700 $CONFIG_EXPERIMENTAL
fi
@@ -320,9 +326,6 @@

source drivers/net/wan/Config.in

-if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_CARDBUS" != "n" ]; then
- source drivers/net/tulip/Config.in
-fi
if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
source drivers/net/pcmcia/Config.in
fi