Module Name: src
Committed By: jakllsch
Date: Fri Dec 14 22:00:26 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
add cardbus malo(4) to x86 GENERIC and ALL kernels
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.512 -r1.513 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.459 -r1.460 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1197 -r1.1198 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.110 src/sys/arch/amd64/conf/ALL:1.111
--- src/sys/arch/amd64/conf/ALL:1.110 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/amd64/conf/ALL Fri Dec 14 22:00:26 2018
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ athn* at cardbus? function ? # Atheros A
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
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.512 src/sys/arch/amd64/conf/GENERIC:1.513
--- src/sys/arch/amd64/conf/GENERIC:1.512 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/amd64/conf/GENERIC Fri Dec 14 22:00:26 2018
@@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ athn* at cardbus? function ? # Atheros A
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
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.459 src/sys/arch/i386/conf/ALL:1.460
--- src/sys/arch/i386/conf/ALL:1.459 Wed Dec 12 06:29:37 2018
+++ src/sys/arch/i386/conf/ALL Fri Dec 14 22:00:26 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ atw* at cardbus? function ? # ADMtek ADM
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
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1197 src/sys/arch/i386/conf/GENERIC:1.1198
--- src/sys/arch/i386/conf/GENERIC:1.1197 Wed Dec 12 06:29:37 2018
+++ src/sys/arch/i386/conf/GENERIC Fri Dec 14 22:00:26 2018
@@ -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 @@ include "arch/i386/conf/std.i386"
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 @@ atw* at cardbus? function ? # ADMtek ADM
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
