From ce8960aa5d2550f374e2e09fc9b421159760a045 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 24 Sep 2002 02:55:33 +0000 Subject: OLDCARD -> NEWCARD pccbb -> cbb PR: 43263 --- sys/conf/NOTES | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a0ccf86..be199ab 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1928,10 +1928,10 @@ device bktr # # card: pccard slots # pcic: isa/pccard bridge -device pcic -hint.pcic.0.at="isa" -hint.pcic.1.at="isa" -device card 1 +#device pcic +#hint.pcic.0.at="isa" +#hint.pcic.1.at="isa" +#device card 1 # # PC Card/PCMCIA and Cardbus @@ -1940,12 +1940,15 @@ device card 1 # Note that NEWCARD and OLDCARD are incompatible. Do not use both at the same # time. # -# pccbb: isa/pccard and pci/cardbus bridge +# pccbb: pci/cardbus bridge implementing YENTA interface # pccard: pccard slots # cardbus: cardbus slots -#device pccbb -#device pccard -#device cardbus +device cbb +device pccard +device cardbus +#device pcic ISA attachment currently busted +#hint.pcic.0.at="isa" +#hint.pcic.1.at="isa" # # SMB bus -- cgit v1.1