From af094d65ba7fff4cdb9871f97e38eb8710dff390 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 Sep 2002 03:10:23 +0000 Subject: [PATCH] move wl (isa wavelan card, not "wi") to i386-only --- sys/conf/NOTES | 6 ------ sys/i386/conf/NOTES | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b30ebc4720b6..d30ae167a9f2 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1567,7 +1567,6 @@ device miibus # wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both # the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA # bridge with a PCMCIA adapter plugged into it. -# wl: Lucent Wavelan (ISA card only). # xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller, # Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card, # Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56 @@ -1623,11 +1622,6 @@ device an device awi device cnw device wi -options WLCACHE # enables the signal-strength cache -options WLDEBUG # enables verbose debugging output -device wl -hint.wl.0.at="isa" -hint.wl.0.port="0x300" device xe # PCI Ethernet NICs that use the common MII bus controller code. diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index a163176bac14..4174ebda57d3 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -429,6 +429,7 @@ hint.mse.0.irq="5" # OC-3141, OC-3540, OC-3250 # rdp: RealTek RTL 8002-based pocket ethernet adapters # sbni: Granch SBNI12-xx ISA and PCI adapters +# wl: Lucent Wavelan (ISA card only). # Order for ISA/EISA devices is important here @@ -465,9 +466,13 @@ hint.sbni.0.at="isa" hint.sbni.0.port="0x210" hint.sbni.0.irq="0xefdead" hint.sbni.0.flags="0" - device oltr hint.oltr.0.at="isa" +device wl +hint.wl.0.at="isa" +hint.wl.0.port="0x300" +options WLCACHE # enables the signal-strength cache +options WLDEBUG # enables verbose debugging output # # Audio drivers: `pca'