summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-26 16:11:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-26 16:11:20 +0000
commit2c211ea63a62db6c69195b3627033d41229f6f19 (patch)
treebaf550ca5e373914d47f190f5378f9039d82d273 /sys
parent83e406b2940bbcf2a59525e9658cdc0bac6bc5b0 (diff)
leave name simple
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8f7ea04d472..24775cf646b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.166 2006/11/26 15:09:47 mglocker Exp $
+# $OpenBSD: GENERIC,v 1.167 2006/11/26 16:11:19 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -389,8 +389,8 @@ rtw* at pci? # Realtek 8180
rtw* at cardbus? # Realtek 8180
pgt* at pci? # Prism54 (only full-mac varients)
pgt* at cardbus? # Prism54 (only full-mac varients)
-malo* at pci? # Marvell Libertas Open
-malo* at cardbus? # Marvell Libertas Open
+malo* at pci? # Marvell Libertas
+malo* at cardbus? # Marvell Libertas
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8f66dead8a1..478ab78a1c7 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.536 2006/11/26 12:02:49 mbalmer Exp $
+# $OpenBSD: GENERIC,v 1.537 2006/11/26 16:11:19 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -535,8 +535,8 @@ rtw* at pci? # Realtek 8180
rtw* at cardbus? # Realtek 8180
pgt* at pci? # Prism54 (only full-mac varients)
pgt* at cardbus? # Prism54 (only full-mac varients)
-malo* at pci? # Marvell Libertas Open
-malo* at cardbus? # Marvell Libertas Open
+malo* at pci? # Marvell Libertas
+malo* at cardbus? # Marvell Libertas
# Media Independent Interface (mii) drivers
exphy* at mii? # 3Com internal PHYs