diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/NOTES | 15 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 15 |
2 files changed, 30 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 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2c7115a..bd884f2 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/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 |
