Module Name: src
Committed By: nakayama
Date: Thu May 26 10:38:07 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Add more CardBus devices.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/arch/sparc64/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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.188 src/sys/arch/sparc64/conf/GENERIC:1.189
--- src/sys/arch/sparc64/conf/GENERIC:1.188 Thu May 26 04:26:05 2016
+++ src/sys/arch/sparc64/conf/GENERIC Thu May 26 10:38:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.188 2016/05/26 04:26:05 nakayama Exp $
+# $NetBSD: GENERIC,v 1.189 2016/05/26 10:38:07 nakayama Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.188 $"
+#ident "GENERIC-$Revision: 1.189 $"
maxusers 64
@@ -773,7 +773,9 @@ pseudo-device stf # 6to4 IPv6 over IPv
# CardBus network interfaces
#ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
+#athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) UT
#atw* at cardbus? function ? # ADMtek ADM8211 (802.11) UT
+#bwi* at cardbus? function ? # Broadcom BCM43xx wireless
#ex* at cardbus? function ? # 3Com 3C575TX
#fxp* at cardbus? function ? # Intel i8255x UT
#ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g UT
@@ -787,6 +789,9 @@ pseudo-device stf # 6to4 IPv6 over IPv
#ohci* at cardbus? function ? # Open Host Controller
#uhci* at cardbus? function ? # Universal Host Controller (Intel) UT
+# CardBus IEEE1394 controllers
+#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller UT
+
## PCMCIA cards; UT marks untested.
# PCMCIA serial interfaces