summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-08-04 16:49:05 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-08-04 16:49:05 +0000
commitd10897eb8775bda9eb018894980aa15923719830 (patch)
treebda58a38c8c6d19f8bc1075400fc12474eabe9f2 /sys/arch
parent06e8e4f5eb0c21058db8764bad883955c4e75676 (diff)
Enable CardBus bus support, and add ne(4).
ok deraadt@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/conf/GENERIC9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 855a0584362..54131340d2c 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.183 2007/07/02 14:29:37 dlg Exp $
+# $OpenBSD: GENERIC,v 1.184 2007/08/04 16:49:04 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -208,6 +208,12 @@ onewire* at uow?
# Bluetooth bus support
#bthub* at ubt?
+# CardBus bus support
+cardbus* at cardslot?
+pcmcia* at cardslot?
+cbb* at pci?
+cardslot* at cbb?
+
#### Standard system devices -- all required for a given architecture
auxio* at ebus?
@@ -414,6 +420,7 @@ lpt* at apio?
stp* at sbus? # STP4020
pcmcia* at stp?
#com* at pcmcia? # PCMCIA modems/serial ports
+ne* at pcmcia? # PCMCIA based NE2000 ethernet
wi* at pci? # WaveLAN IEEE 802.11DS
wi* at pcmcia? # WaveLAN IEEE 802.11DS