d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from sys/i386/conf/GENERIC rev 1.218 & 1.219.

Browse Source
This commit is contained in:
kato 1999-12-24 11:12:43 +00:00
parent fb7ba399d4
commit a5356d182b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/pc98/conf/GENERIC
View File

@ -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

4
sys/pc98/conf/GENERIC98
View File

@ -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