The included patch fixes some indenting and completes the name-fillouts
for the 3Com adapters (3c507 == EtherLink 16, and the 3c523 is
EtherLink/MC, not EtherLinkMC)
/David Weinehall
_ _
// David Weinehall <tao@acc.umu.se> /> Northern lights wander \\
// Project MCA Linux hacker // Dance across the winter sky //
\> http://www.acc.umu.se/~tao/ </ Full colour fire </
--- linux-2.3.99pre7/drivers/net/Config.in.old Fri May 12 14:16:29 2000
+++ linux-2.3.99pre7/drivers/net/Config.in Fri May 12 14:21:26 2000
@@ -49,7 +49,7 @@
tristate ' MIPS JAZZ onboard SONIC Ethernet support' CONFIG_MIPS_JAZZ_SONIC
fi
if [ "$CONFIG_SGI_IP27" = "y" ]; then
- bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
+ bool ' SGI IOC3 Ethernet' CONFIG_SGI_IOC3_ETH
fi
bool ' 3COM cards' CONFIG_NET_VENDOR_3COM
if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then
@@ -57,12 +57,12 @@
tristate ' 3c503 "EtherLink II" support' CONFIG_EL2
tristate ' 3c505 "EtherLink Plus" support' CONFIG_ELPLUS
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate ' 3c507 support (EXPERIMENTAL)' CONFIG_EL16
+ tristate ' 3c507 "EtherLink 16" support (EXPERIMENTAL)' CONFIG_EL16
fi
tristate ' 3c509/3c529 (MCA)/3c579 "EtherLink III" support' CONFIG_EL3
tristate ' 3c515 ISA Fast EtherLink' CONFIG_3C515
if [ "$CONFIG_MCA" = "y" ]; then
- tristate ' 3c523 EtherLinkMC support' CONFIG_ELMC
+ tristate ' 3c523 EtherLink/MC support' CONFIG_ELMC
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' 3c527 EtherLink/MC 32 support (EXPERIMENTAL)' CONFIG_ELMC_II
fi
@@ -81,15 +81,15 @@
if [ "$CONFIG_OBSOLETE" = "y" ]; then
tristate ' SMC 9194 support' CONFIG_SMC9194
fi
- fi
- bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
- if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate ' NI5010 support (EXPERIMENTAL)' CONFIG_NI5010
- fi
- tristate ' NI5210 support' CONFIG_NI52
- tristate ' NI6510 support' CONFIG_NI65
- fi
+ fi
+ bool ' Racal-Interlan (Micom) NI cards' CONFIG_NET_VENDOR_RACAL
+ if [ "$CONFIG_NET_VENDOR_RACAL" = "y" ]; then
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate ' NI5010 support (EXPERIMENTAL)' CONFIG_NI5010
+ fi
+ tristate ' NI5210 support' CONFIG_NI52
+ tristate ' NI6510 support' CONFIG_NI65
+ fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700
fi
@@ -98,7 +98,7 @@
if [ "$CONFIG_NET_ISA" = "y" ]; then
tristate ' Cabletron E21xx support' CONFIG_E2100
if [ "$CONFIG_OBSOLETE" = "y" ]; then
- tristate ' EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
+ tristate ' EtherWORKS 3 (DE203, DE204, DE205) support' CONFIG_EWRK3
fi
tristate ' EtherExpress 16 support' CONFIG_EEXPRESS
tristate ' EtherExpressPro support' CONFIG_EEXPRESS_PRO
@@ -117,7 +117,7 @@
fi
if [ "$CONFIG_MCA" = "y" ]; then
tristate ' SKnet MCA support' CONFIG_SKMC
- tristate ' NE/2 (ne2000 MCA version) support' CONFIG_NE2_MCA
+ tristate ' NE/2 (NE2000 MCA version) support' CONFIG_NE2_MCA
fi
bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
if [ "$CONFIG_NET_PCI" = "y" ]; then
@@ -179,15 +179,16 @@
mainmenu_option next_comment
comment 'Ethernet (1000 Mbit)'
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- # tristate 'Packet Engines Hamachi GNIC-II support (EXPERIMENTAL)' CONFIG_HAMACHI
- tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN
- fi
- tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC
- if [ "$CONFIG_ACENIC" != "n" ]; then
- bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
- fi
- tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+# tristate 'Packet Engines Hamachi GNIC-II support (EXPERIMENTAL)' CONFIG_HAMACHI
+ tristate 'Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)' CONFIG_YELLOWFIN
+fi
+tristate 'Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support' CONFIG_ACENIC
+if [ "$CONFIG_ACENIC" != "n" ]; then
+ bool ' Omit support for old Tigon I based AceNICs' CONFIG_ACENIC_OMIT_TIGON_I
+fi
+tristate 'SysKonnect SK-98xx support' CONFIG_SK98LIN
+
endmenu
bool 'FDDI driver support' CONFIG_FDDI
@@ -220,7 +221,7 @@
dep_tristate ' PPP Deflate compression' CONFIG_PPP_DEFLATE $CONFIG_PPP
dep_tristate ' PPP BSD-Compress compression' CONFIG_PPP_BSDCOMP m
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
+ dep_tristate ' PPP over Ethernet (EXPERIMENTAL)' CONFIG_PPPOE $CONFIG_PPP
fi
fi
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon May 15 2000 - 21:00:20 EST