On Tue, Mar 07, 2000 at 12:05:26PM +0000, Alan Cox wrote:
> > ide is much worst than 'net' but fixable......
> >
> > ./drivers/net/Config.in
> >
> > - bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
> > + if [ "$CONFIG_PCI" = "y" ]; then
> > + bool ' EISA, VLB, PCI and on board controllers' CONFIG_NET_PCI
> > + fi
> >
>
> That is wrong. Many of those controllers are on non PCI machines. Whoever
> made that diff fucked up
>
Wouldn't it make more sense to separate it into separate chunks
i.e. CONFIG_NET_PCI, CONFIG_NET_EISA, CONFIG_NET_VLB, CONFIG_NET_ONBOARD
and *then* check for CONFIG_PCI before offering CONFIG_NET_PCI?
Or maybe I'm just completely clueless.
------------------------------------------------------------------------
--- Config.in Thu Mar 2 07:30:43 2000
+++ Config.in.new Tue Mar 7 09:46:26 2000
@@ -119,21 +119,31 @@
tristate ' SKnet MCA support' CONFIG_SKMC
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
- tristate ' AMD PCnet32 (VLB and PCI) support' CONFIG_PCNET32
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate ' Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE
- fi
+ bool ' Other EISA cards' CONFIG_NET_EISA
+ if [ "$CONFIG_NET_EISA" = "y" ]; then
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' Ansel Communications EISA 3200 support (EXPERIMENTAL)' CONFIG_AC3200
fi
-
- tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT
if [ "$CONFIG_OBSOLETE" = "y" ]; then
tristate ' CS89x0 support' CONFIG_CS89x0
fi
- tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+ tristate ' Generic DECchip & DIGITAL EtherWORKS EISA' CONFIG_DE4X5
+ tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
+ tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
+ tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
+ fi
+ fi
+ if [ "$CONFIG_PCI" = "y" ]; then
+ bool ' Other PCI cards' CONFIG_NET_PCI
+ fi
+ if [ "$CONFIG_NET_PCI" = "y" ]; then
+ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate ' Adaptec Starfire support (EXPERIMENTAL)' CONFIG_ADAPTEC_STARFIRE
+ fi
+ tristate ' AMD PCnet32 (PCI) support' CONFIG_PCNET32
+ tristate ' Generic DECchip & DIGITAL EtherWORKS PCI' CONFIG_DE4X5
tristate ' DECchip Tulip (dc21x4x) PCI support' CONFIG_TULIP
tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
@@ -144,26 +154,30 @@
if [ "$CONFIG_EEPRO100" = "y" -o "$CONFIG_EEPRO100" = "m" ]; then
bool ' Enable Power Management (EXPERIMENTAL)' CONFIG_EEPRO100_PM
fi
- tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390
- tristate ' Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)' CONFIG_NE3210
fi
tristate ' PCI NE2000 support' CONFIG_NE2K_PCI
- # tristate ' Sundance Alta support' CONFIG_ALTA
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate ' RealTek 8129 (not 8019/8029!) support (EXPERIMENTAL)' CONFIG_RTL8129
fi
tristate ' RealTek RTL-8139 PCI Fast Ethernet Adapter support' CONFIG_8139TOO
tristate ' SiS 900/7016 PCI Fast Ethernet Adapter support' CONFIG_SIS900
- tristate ' TI ThunderLAN support' CONFIG_TLAN
- tristate ' VIA Rhine support' CONFIG_VIA_RHINE
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate ' Racal-Interlan EISA ES3210 support (EXPERIMENTAL)' CONFIG_ES3210
tristate ' SMC EtherPower II (EXPERIMENTAL)' CONFIG_EPIC100
fi
+ tristate ' TI ThunderLAN support' CONFIG_TLAN
+ tristate ' VIA Rhine support' CONFIG_VIA_RHINE
+ fi
+ bool ' Other VLB cards' CONFIG_NET_VLB
+ if [ "$CONFIG_NET_VLB" = "y" ]; then
+ tristate ' AMD PCnet32 (VLB) support' CONFIG_PCNET32
+ fi
+ bool ' Other on board controllers' CONFIG_NET_ONBOARD
+ if [ "$CONFIG_NET_ONBOARD" = "y" ]; then
+ tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT
if [ "$CONFIG_OBSOLETE" = "y" ]; then
bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET
fi
- fi
+ fi
bool ' Pocket and portable adapters' CONFIG_NET_POCKET
if [ "$CONFIG_NET_POCKET" = "y" ]; then
tristate ' AT-LAN-TEC/RealTek pocket adapter support' CONFIG_ATP
------------------------------------------------------------------------
Tim
-- ------------------------------------------------------------------------ tim@beastor.mine.nu Software Developer/Systems Administrator/RDBMS Specialist/Linux Advocate University of Waterloo Honours Co-op Combinatorics & Optimization finger tim@beastor.mine.nu for PGP public key ID 0xCB7C7974
- 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 : Tue Mar 07 2000 - 21:00:22 EST