Module Name: src
Committed By: chs
Date: Mon Apr 21 16:35:38 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
add malo at pcmcia.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.385 -r1.386 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.372 -r1.373 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1102 -r1.1103 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.5 src/sys/arch/amd64/conf/ALL:1.6
--- src/sys/arch/amd64/conf/ALL:1.5 Tue Apr 8 22:04:16 2014
+++ src/sys/arch/amd64/conf/ALL Mon Apr 21 16:35:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.5 2014/04/08 22:04:16 riastradh Exp $
+# $NetBSD: ALL,v 1.6 2014/04/21 16:35:38 chs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.5 $"
+#ident "ALL-$Revision: 1.6 $"
maxusers 64 # estimated number of users
@@ -935,6 +935,7 @@ awi* at pcmcia? function ? # BayStack 6
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
cs* at pcmcia? function ? # CS89xx Ethernet
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+malo* at pcmcia? function ? # Marvell Libertas
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.385 src/sys/arch/amd64/conf/GENERIC:1.386
--- src/sys/arch/amd64/conf/GENERIC:1.385 Tue Apr 8 21:08:36 2014
+++ src/sys/arch/amd64/conf/GENERIC Mon Apr 21 16:35:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.385 2014/04/08 21:08:36 riastradh Exp $
+# $NetBSD: GENERIC,v 1.386 2014/04/21 16:35:38 chs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.385 $"
+#ident "GENERIC-$Revision: 1.386 $"
maxusers 64 # estimated number of users
@@ -752,6 +752,7 @@ awi* at pcmcia? function ? # BayStack 6
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
cs* at pcmcia? function ? # CS89xx Ethernet
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+malo* at pcmcia? function ? # Marvell Libertas
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.372 src/sys/arch/i386/conf/ALL:1.373
--- src/sys/arch/i386/conf/ALL:1.372 Tue Apr 8 22:04:15 2014
+++ src/sys/arch/i386/conf/ALL Mon Apr 21 16:35:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.372 2014/04/08 22:04:15 riastradh Exp $
+# $NetBSD: ALL,v 1.373 2014/04/21 16:35:38 chs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.372 $"
+#ident "ALL-$Revision: 1.373 $"
maxusers 64 # estimated number of users
@@ -1073,6 +1073,7 @@ awi* at pcmcia? function ? # BayStack 6
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
cs* at pcmcia? function ? # CS89xx Ethernet
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+malo* at pcmcia? function ? # Marvell Libertas
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1102 src/sys/arch/i386/conf/GENERIC:1.1103
--- src/sys/arch/i386/conf/GENERIC:1.1102 Tue Apr 8 19:40:57 2014
+++ src/sys/arch/i386/conf/GENERIC Mon Apr 21 16:35:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1102 2014/04/08 19:40:57 christos Exp $
+# $NetBSD: GENERIC,v 1.1103 2014/04/21 16:35:38 chs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1102 $"
+#ident "GENERIC-$Revision: 1.1103 $"
maxusers 64 # estimated number of users
@@ -1017,6 +1017,7 @@ awi* at pcmcia? function ? # BayStack 6
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
cs* at pcmcia? function ? # CS89xx Ethernet
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
+malo* at pcmcia? function ? # Marvell Libertas
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
