Merge from sys/i386/conf/GENERIC rev 1.218 & 1.219.
This commit is contained in:
parent
ece6ef6a7b
commit
a612687a3a
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user