[src/trunk]: src/sys/arch Add malo(4) entry in various kernel configuration

[degroote <degroote%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43b72dd7e342
branches:  trunk
changeset: 780598:43b72dd7e342
user:      degroote <degroote%NetBSD.org@localhost>
date:      Mon Jul 30 19:40:51 2012 +0000

description:
Add malo(4) entry in various kernel configuration

diffstat:

 sys/arch/amd64/conf/GENERIC |  5 +++--
 sys/arch/i386/conf/ALL      |  5 +++--
 sys/arch/i386/conf/GENERIC  |  5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (78 lines):

diff -r 5a2bbc206483 -r 43b72dd7e342 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Jul 30 19:31:06 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Jul 30 19:40:51 2012 +0000
@@ -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 @@
 
 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 @@
 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
diff -r 5a2bbc206483 -r 43b72dd7e342 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Mon Jul 30 19:31:06 2012 +0000
+++ b/sys/arch/i386/conf/ALL    Mon Jul 30 19:40:51 2012 +0000
@@ -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 @@
 
 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 @@
 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
diff -r 5a2bbc206483 -r 43b72dd7e342 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Mon Jul 30 19:31:06 2012 +0000
+++ b/sys/arch/i386/conf/GENERIC        Mon Jul 30 19:40:51 2012 +0000
@@ -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 @@
 
 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 @@
 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