summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2007-08-05 17:01:26 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2007-08-05 17:01:26 +0000
commit5ad64e242e3fda6dbfa861b5c0ba5693c8a594dd (patch)
tree0b3fe9c176c00691c4dadb95bb50674b647aa869 /sys/arch/i386/conf
parent3cb1bb925c9c06ee5a299267a99ecb386b048a2d (diff)
Enable Compact Flash driver for the Marvell 88W8385 chip in
zaurus, amd64, and i386 GENERIC. OK claudio@, deraadt@
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index c541c040c8c..796880e86d6 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.567 2007/07/02 14:29:37 dlg Exp $
+# $OpenBSD: GENERIC,v 1.568 2007/08/05 17:01:25 mglocker Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -561,6 +561,7 @@ pgt* at pci? # Prism54 (only full-mac varients)
pgt* at cardbus? # Prism54 (only full-mac varients)
malo* at pci? # Marvell Libertas
malo* at cardbus? # Marvell Libertas
+malo* at pcmcia? # Marvell 88W8385
mbg* at pci? # Meinberg Funkuhren radio clocks
# Media Independent Interface (mii) drivers