[src/trunk]: src/sys/arch add cardbus malo(4) to x86 GENERIC and ALL kernels

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

details:   https://anonhg.NetBSD.org/src/rev/e4c9d989e0d4
branches:  trunk
changeset: 446694:e4c9d989e0d4
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Dec 14 22:00:26 2018 +0000

description:
add cardbus malo(4) to x86 GENERIC and ALL kernels

diffstat:

 sys/arch/amd64/conf/ALL     |  5 +++--
 sys/arch/amd64/conf/GENERIC |  5 +++--
 sys/arch/i386/conf/ALL      |  5 +++--
 sys/arch/i386/conf/GENERIC  |  5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diffs (104 lines):

diff -r 9d1b949e1f69 -r e4c9d989e0d4 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Fri Dec 14 21:49:22 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Fri Dec 14 22:00:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.110 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: ALL,v 1.111 2018/12/14 22:00:26 jakllsch 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.110 $"
+#ident         "ALL-$Revision: 1.111 $"
 
 maxusers       64              # estimated number of users
 
@@ -1061,6 +1061,7 @@
 atw*   at cardbus? function ?  # ADMtek ADM8211 (802.11)
 ex*    at cardbus? function ?  # 3Com 3c575TX
 fxp*   at cardbus? function ?  # Intel i8255x
+malo*  at cardbus? function ?  # Marvell Libertas Wireless
 ral*   at cardbus? function ?  # Ralink Technology RT25x0 802.11a/b/g
 re*    at cardbus? function ?  # Realtek 8139C+/8169/8169S/8110S
 rtk*   at cardbus? function ?  # Realtek 8129/8139
diff -r 9d1b949e1f69 -r e4c9d989e0d4 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Dec 14 21:49:22 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Dec 14 22:00:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.512 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: GENERIC,v 1.513 2018/12/14 22:00:26 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.512 $"
+#ident         "GENERIC-$Revision: 1.513 $"
 
 maxusers       64              # estimated number of users
 
@@ -856,6 +856,7 @@
 atw*   at cardbus? function ?  # ADMtek ADM8211 (802.11)
 ex*    at cardbus? function ?  # 3Com 3C575TX
 fxp*   at cardbus? function ?  # Intel i8255x
+malo*  at cardbus? function ?  # Marvell Libertas Wireless
 ral*   at cardbus? function ?  # Ralink Technology RT25x0 802.11a/b/g
 re*    at cardbus? function ?  # Realtek 8139C+/8169/8169S/8110S
 rtk*   at cardbus? function ?  # Realtek 8129/8139
diff -r 9d1b949e1f69 -r e4c9d989e0d4 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Fri Dec 14 21:49:22 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Fri Dec 14 22:00:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.459 2018/12/12 06:29:37 maxv Exp $
+# $NetBSD: ALL,v 1.460 2018/12/14 22:00:26 jakllsch 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.459 $"
+#ident         "ALL-$Revision: 1.460 $"
 
 maxusers       64              # estimated number of users
 
@@ -1165,6 +1165,7 @@
 bwi*   at cardbus? function ?  # Broadcom BCM43xx wireless
 ex*    at cardbus? function ?  # 3Com 3c575TX
 fxp*   at cardbus? function ?  # Intel i8255x
+malo*  at cardbus? function ?  # Marvell Libertas Wireless
 ral*   at cardbus? function ?  # Ralink Technology RT25x0 802.11a/b/g
 re*    at cardbus? function ?  # Realtek 8139C+/8169/8169S/8110S
 rtk*   at cardbus? function ?  # Realtek 8129/8139
diff -r 9d1b949e1f69 -r e4c9d989e0d4 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Fri Dec 14 21:49:22 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC        Fri Dec 14 22:00:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1197 2018/12/12 06:29:37 maxv Exp $
+# $NetBSD: GENERIC,v 1.1198 2018/12/14 22:00:26 jakllsch Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.1197 $"
+#ident         "GENERIC-$Revision: 1.1198 $"
 
 maxusers       64              # estimated number of users
 
@@ -1097,6 +1097,7 @@
 bwi*   at cardbus? function ?  # Broadcom BCM43xx wireless
 ex*    at cardbus? function ?  # 3Com 3c575TX
 fxp*   at cardbus? function ?  # Intel i8255x
+malo*  at cardbus? function ?  # Marvell Libertas Wireless
 ral*   at cardbus? function ?  # Ralink Technology RT25x0 802.11a/b/g
 re*    at cardbus? function ?  # Realtek 8139C+/8169/8169S/8110S
 rtk*   at cardbus? function ?  # Realtek 8129/8139