From 67534f1dc5c01100b4a2bd120717b9d812323ca7 Mon Sep 17 00:00:00 2001 From: kato Date: Fri, 24 Dec 1999 11:12:43 +0000 Subject: Merge from sys/i386/conf/GENERIC rev 1.218 & 1.219. --- sys/pc98/conf/GENERIC | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/pc98/conf/GENERIC') diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 27730f9..9d0d4c0 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -94,7 +94,7 @@ controller ahc0 # AHA2940 and onboard AIC7xxx devices controller amd0 # AMD 53C974 (Teckram DC-390(T)) controller isp0 # Qlogic family controller ncr0 # NCR/Symbios Logic -#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts) +controller sym0 # NCR/Symbios Logic (newer chipsets) # # WD33C93 SCSI card (55/92 like board) @@ -246,7 +246,7 @@ device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # NOTE: This removes the isa attachment so that the pccard unit numbers # come out right. device ep0 at isa? port 0x40d0 irq 3 -# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really +# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really # exists only as a PCMCIA device, so there is no ISA attatement needed # and resources will always be dynamically assigned by the pccard code. #device wi0 -- cgit v1.1