summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2001-06-17 02:02:33 +0000
committerimp <imp@FreeBSD.org>2001-06-17 02:02:33 +0000
commit134fd54559f7ffd5f9b6a01170de5fd9c318d382 (patch)
tree1705891b04683515d0c3ede668c6f7e8ed9503fe /sys
parentb5460aa75b929e3d756678ffec8d1968b9800a5d (diff)
downloadFreeBSD-src-134fd54559f7ffd5f9b6a01170de5fd9c318d382.zip
FreeBSD-src-134fd54559f7ffd5f9b6a01170de5fd9c318d382.tar.gz
Move cardbus and pccard bus bridge devices to near the bridge chips. This
is so that all the pccard options are together and this reduces diffs with GENERIC.
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/conf/NEWCARD4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD
index 9ecdc21..2e3942c 100644
--- a/sys/i386/conf/NEWCARD
+++ b/sys/i386/conf/NEWCARD
@@ -70,8 +70,6 @@ options WITNESS
device isa
device eisa
device pci
-device pccard
-device cardbus
# Floppy drives
device fdc
@@ -152,6 +150,8 @@ device pmtimer
# Pcmcia and cardbus bridge support
#device pcic # pcmcia bridge
device pccbb # cardbus (yenta) bridge
+device pccard
+device cardbus
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
OpenPOWER on IntegriCloud