Module Name: src
Committed By: degroote
Date: Mon Jul 30 19:40:52 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
Add malo(4) entry in various kernel configuration
To generate a diff of this commit:
cvs rdiff -u -r1.357 -r1.358 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.340 -r1.341 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1075 -r1.1076 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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.357 src/sys/arch/amd64/conf/GENERIC:1.358
--- src/sys/arch/amd64/conf/GENERIC:1.357 Thu Jun 14 04:23:48 2012
+++ src/sys/arch/amd64/conf/GENERIC Mon Jul 30 19:40:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.357 2012/06/14 04:23:48 riz Exp $
+# $NetBSD: GENERIC,v 1.358 2012/07/30 19:40:51 degroote 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.357 $"
+#ident "GENERIC-$Revision: 1.358 $"
maxusers 64 # estimated number of users
@@ -714,6 +714,7 @@ hme* at pci? dev ? function ? # Sun Micr
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
+malo* at pci? dev ? function ? # Marvell Libertas Wireless
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.340 src/sys/arch/i386/conf/ALL:1.341
--- src/sys/arch/i386/conf/ALL:1.340 Sun Jul 22 14:23:47 2012
+++ src/sys/arch/i386/conf/ALL Mon Jul 30 19:40:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.340 2012/07/22 14:23:47 matt Exp $
+# $NetBSD: ALL,v 1.341 2012/07/30 19:40:52 degroote 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.340 $"
+#ident "ALL-$Revision: 1.341 $"
maxusers 64 # estimated number of users
@@ -1012,6 +1012,7 @@ jme* at pci? dev ? function ? # JMicron
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
+malo* at pci? dev ? function ? # Marvell Libertas Wireless
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1075 src/sys/arch/i386/conf/GENERIC:1.1076
--- src/sys/arch/i386/conf/GENERIC:1.1075 Thu Jun 14 04:23:49 2012
+++ src/sys/arch/i386/conf/GENERIC Mon Jul 30 19:40:52 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1075 2012/06/14 04:23:49 riz Exp $
+# $NetBSD: GENERIC,v 1.1076 2012/07/30 19:40:52 degroote 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.1075 $"
+#ident "GENERIC-$Revision: 1.1076 $"
maxusers 64 # estimated number of users
@@ -968,6 +968,7 @@ jme* at pci? dev ? function ? # JMicron
le* at pci? dev ? function ? # PCnet-PCI Ethernet
lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
+malo* at pci? dev ? function ? # Marvell Libertas Wireless
mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet
mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
