Module Name: src
Committed By: dholland
Date: Fri Nov 25 23:15:28 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
sort iwm* before iwn*
To generate a diff of this commit:
cvs rdiff -u -r1.438 -r1.439 src/sys/arch/amd64/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.438 src/sys/arch/amd64/conf/GENERIC:1.439
--- src/sys/arch/amd64/conf/GENERIC:1.438 Fri Nov 25 23:06:58 2016
+++ src/sys/arch/amd64/conf/GENERIC Fri Nov 25 23:15:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.438 2016/11/25 23:06:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.439 2016/11/25 23:15:28 dholland 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.438 $"
+#ident "GENERIC-$Revision: 1.439 $"
maxusers 64 # estimated number of users
@@ -750,8 +750,8 @@ fxp* at pci? dev ? function ? # Intel Et
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100
iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG
-iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
iwm* at pci? dev ? function ? # Intel Centrino 7260
+iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN
ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit
ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function
jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet
