diff options
| author | jhb <jhb@FreeBSD.org> | 2001-05-09 19:37:25 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-05-09 19:37:25 +0000 |
| commit | 09b73b2614a06cfbe26701be131574975277032f (patch) | |
| tree | c1e23cf97ebf8a4d86dbb7abe632d88f984a2918 /sys/conf | |
| parent | 37163a5501446aafd5ab06308ef61069e48ee28d (diff) | |
| download | FreeBSD-src-09b73b2614a06cfbe26701be131574975277032f.zip FreeBSD-src-09b73b2614a06cfbe26701be131574975277032f.tar.gz | |
Add in commented out entries for NEWCARD so that they are at least
documented. They cannot be turned on by default due to conflicting
symbols at link time between OLDCARD and NEWCARD.
Approved by: imp
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 2c7115a..bd884f2 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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 |
