Module Name: src
Committed By: riz
Date: Tue Jun 12 22:07:08 UTC 2012
Modified Files:
src/sys/arch/amd64/conf [netbsd-6]: GENERIC
src/sys/arch/i386/conf [netbsd-6]: GENERIC
Log Message:
Remove test changes which accidentally snuck in on the netbsd-6 branch.
Oops.
To generate a diff of this commit:
cvs rdiff -u -r1.348.2.2 -r1.348.2.3 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1066.2.2 -r1.1066.2.3 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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.348.2.2 src/sys/arch/amd64/conf/GENERIC:1.348.2.3
--- src/sys/arch/amd64/conf/GENERIC:1.348.2.2 Tue Jun 12 17:48:03 2012
+++ src/sys/arch/amd64/conf/GENERIC Tue Jun 12 22:07:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.348.2.2 2012/06/12 17:48:03 riz Exp $
+# $NetBSD: GENERIC,v 1.348.2.3 2012/06/12 22:07:07 riz 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.348.2.2 $"
+#ident "GENERIC-$Revision: 1.348.2.3 $"
maxusers 64 # estimated number of users
@@ -962,7 +962,6 @@ atu* at uhub? port ? # Atmel at76c50x 8
otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
-urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd* at uhub? port ? # Zydas ZD1211
# USB scanners that use SCSI emulation, e.g., HP5300
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1066.2.2 src/sys/arch/i386/conf/GENERIC:1.1066.2.3
--- src/sys/arch/i386/conf/GENERIC:1.1066.2.2 Tue Jun 12 17:47:51 2012
+++ src/sys/arch/i386/conf/GENERIC Tue Jun 12 22:07:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066.2.2 2012/06/12 17:47:51 riz Exp $
+# $NetBSD: GENERIC,v 1.1066.2.3 2012/06/12 22:07:07 riz 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.1066.2.2 $"
+#ident "GENERIC-$Revision: 1.1066.2.3 $"
maxusers 64 # estimated number of users
@@ -1226,7 +1226,6 @@ otus* at uhub? port ? # Atheros AR9001U
ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g
rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g
upgt* at uhub? port ? # Intersil PrismGT
-urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd* at uhub? port ? # Zydas ZD1211
# Prolific PL2301/PL2302 host-to-host adapter
