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

Add in commented out entries for NEWCARD so that they are at least

Browse Source 
documented.  They cannot be turned on by default due to conflicting
symbols at link time between OLDCARD and NEWCARD.

Approved by:	imp
This commit is contained in:
John Baldwin 2001-05-09 19:37:25 +00:00
parent 68e691b2ab
commit 0142c72785
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/conf/NOTES
View File

@ -2212,6 +2212,7 @@ device bktr 1
#
# PC Card/PCMCIA
# (OLDCARD)
#
# card: pccard slots
# pcic: isa/pccard bridge
@ -2220,6 +2221,20 @@ hint.pcic.0.at="isa"
hint.pcic.1.at="isa"
device card
#
# PC Card/PCMCIA and Cardbus
# (NEWCARD)
#
# Note that NEWCARD and OLDCARD are incompatible. Do not use both at the same
# time.
#
# pccbb: isa/pccard and pci/cardbus bridge
# pccard: pccard slots
# cardbus: cardbus slots
#device pccbb
#device pccard
#device cardbus
# You may need to reset all pccards after resuming
options PCIC_RESUME_RESET # reset after resume

15
sys/i386/conf/NOTES
View File

@ -2212,6 +2212,7 @@ device bktr 1
#
# PC Card/PCMCIA
# (OLDCARD)
#
# card: pccard slots
# pcic: isa/pccard bridge
@ -2220,6 +2221,20 @@ hint.pcic.0.at="isa"
hint.pcic.1.at="isa"
device card
#
# PC Card/PCMCIA and Cardbus
# (NEWCARD)
#
# Note that NEWCARD and OLDCARD are incompatible. Do not use both at the same
# time.
#
# pccbb: isa/pccard and pci/cardbus bridge
# pccard: pccard slots
# cardbus: cardbus slots
#device pccbb
#device pccard
#device cardbus
# You may need to reset all pccards after resuming
options PCIC_RESUME_RESET # reset after resume