summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf/GENERIC
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-02-16 22:59:45 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-02-16 22:59:45 +0000
commit0c9e8e7129e5778b5656fa720ff46c89c255a984 (patch)
tree13a748f6169f039bff7b8681a5d699cf59a0df3f /sys/arch/macppc/conf/GENERIC
parent4a2bca54fb480079c48b9e7a11a357e8d2987b5c (diff)
Enable malo(4) on macppc. OK mglocker@ deraadt@
Diffstat (limited to 'sys/arch/macppc/conf/GENERIC')
-rw-r--r--sys/arch/macppc/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 1f92cfa2c41..8a533760ec9 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.159 2007/02/07 03:23:23 dlg Exp $g
+# $OpenBSD: GENERIC,v 1.160 2007/02/16 22:59:44 claudio Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -95,6 +95,7 @@ musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
mbg* at pci? # Meinberg Funkuhren radio clocks
+malo* at pci? # Marvell Libertas
iop* at pci? # I2O processor
ioprbs* at iop? # I2O arrays
@@ -312,6 +313,7 @@ rtw* at cardbus? # Realtek 8180
wdc* at pcmcia?
com* at pcmcia?
com* at cardbus?
+malo* at cardbus? # Marvell Libertas
wsdisplay* at vgafb?