summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2002-07-07 19:00:00 +0000
committerimp <imp@FreeBSD.org>2002-07-07 19:00:00 +0000
commit499545477275c9a081c0b8177dc79b6b338179a1 (patch)
tree6dd266b70922bd1981b80a380fd2cebebc539d51
parent6793e7aaf6adf79bc75aaff6bd5250048f3f61f5 (diff)
downloadFreeBSD-src-499545477275c9a081c0b8177dc79b6b338179a1.zip
FreeBSD-src-499545477275c9a081c0b8177dc79b6b338179a1.tar.gz
Make NEWCARD the default pccard/cardbus system.
-rw-r--r--sys/amd64/conf/GENERIC7
-rw-r--r--sys/i386/conf/GENERIC7
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 5abf1f5..208ceae 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -149,8 +149,11 @@ device apm
device pmtimer
# PCCARD (PCMCIA) support
-device card # pccard bus
-device pcic # PCMCIA bridge
+# Pcmcia and cardbus bridge support
+device pccbb # cardbus (yenta) bridge
+#device pcic # ExCA ISA and PCI bridges
+device pccard # PC Card (16-bit) bus
+device cardbus # CardBus (32-bit) bus
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 5abf1f5..208ceae 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -149,8 +149,11 @@ device apm
device pmtimer
# PCCARD (PCMCIA) support
-device card # pccard bus
-device pcic # PCMCIA bridge
+# Pcmcia and cardbus bridge support
+device pccbb # cardbus (yenta) bridge
+#device pcic # ExCA ISA and PCI bridges
+device pccard # PC Card (16-bit) bus
+device cardbus # CardBus (32-bit) bus
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
OpenPOWER on IntegriCloud