Module Name: src
Committed By: tnn
Date: Thu Jan 7 18:49:30 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC XBOX XEN3_DOM0
Log Message:
uhmodem(4) is superseded by u3g(4) and u3ginit(4).
Prepare for uhmodem(4) removal by not building it anymore.
This may fix PR kern/41174.
To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.226 -r1.227 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.958 -r1.959 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XBOX
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/conf/XEN3_DOM0
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.261 src/sys/arch/amd64/conf/GENERIC:1.262
--- src/sys/arch/amd64/conf/GENERIC:1.261 Thu Jan 7 00:18:47 2010
+++ src/sys/arch/amd64/conf/GENERIC Thu Jan 7 18:49:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.261 2010/01/07 00:18:47 martin Exp $
+# $NetBSD: GENERIC,v 1.262 2010/01/07 18:49:30 tnn Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.261 $"
+#ident "GENERIC-$Revision: 1.262 $"
maxusers 64 # estimated number of users
@@ -804,10 +804,6 @@
umodem* at uhub? port ? configuration ?
ucom* at umodem?
-# Huawei E220 3G/HSDPA modem
-uhmodem* at uhub? port ? configuration ? interface ?
-ucom* at uhmodem? portno ?
-
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.226 src/sys/arch/i386/conf/ALL:1.227
--- src/sys/arch/i386/conf/ALL:1.226 Thu Jan 7 00:18:47 2010
+++ src/sys/arch/i386/conf/ALL Thu Jan 7 18:49:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.226 2010/01/07 00:18:47 martin Exp $
+# $NetBSD: ALL,v 1.227 2010/01/07 18:49:30 tnn 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.226 $"
+#ident "ALL-$Revision: 1.227 $"
maxusers 64 # estimated number of users
@@ -1183,10 +1183,6 @@
umodem* at uhub? port ? configuration ?
ucom* at umodem?
-# Huawei E220 3G/HSDPA modem
-uhmodem* at uhub? port ? configuration ? interface ?
-ucom* at uhmodem? portno ?
-
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.958 src/sys/arch/i386/conf/GENERIC:1.959
--- src/sys/arch/i386/conf/GENERIC:1.958 Thu Jan 7 00:18:47 2010
+++ src/sys/arch/i386/conf/GENERIC Thu Jan 7 18:49:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.958 2010/01/07 00:18:47 martin Exp $
+# $NetBSD: GENERIC,v 1.959 2010/01/07 18:49:30 tnn Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.958 $"
+#ident "GENERIC-$Revision: 1.959 $"
maxusers 64 # estimated number of users
@@ -1133,10 +1133,6 @@
umodem* at uhub? port ? configuration ?
ucom* at umodem?
-# Huawei E220 3G/HSDPA modem
-uhmodem* at uhub? port ? configuration ? interface ?
-ucom* at uhmodem? portno ?
-
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
Index: src/sys/arch/i386/conf/XBOX
diff -u src/sys/arch/i386/conf/XBOX:1.19 src/sys/arch/i386/conf/XBOX:1.20
--- src/sys/arch/i386/conf/XBOX:1.19 Sun Jan 3 03:53:34 2010
+++ src/sys/arch/i386/conf/XBOX Thu Jan 7 18:49:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.19 2010/01/03 03:53:34 dholland Exp $
+# $NetBSD: XBOX,v 1.20 2010/01/07 18:49:30 tnn Exp $
#
# XBOX -- A basic Microsoft XBox kernel config file.
#
@@ -203,10 +203,6 @@
umodem* at uhub? port ? configuration ?
ucom* at umodem?
-# Huawei E220 3G/HSDPA modem
-uhmodem* at uhub? port ? configuration ? interface ?
-ucom* at uhmodem? portno ?
-
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.26 src/sys/arch/i386/conf/XEN3_DOM0:1.27
--- src/sys/arch/i386/conf/XEN3_DOM0:1.26 Sun Jan 3 03:53:34 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Jan 7 18:49:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.26 2010/01/03 03:53:34 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.27 2010/01/07 18:49:30 tnn Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -549,10 +549,6 @@
umodem* at uhub? port ? configuration ?
ucom* at umodem?
-# Huawei E220 3G/HSDPA modem
-uhmodem* at uhub? port ? configuration ? interface ?
-ucom* at uhmodem? portno ?
-
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
wd* at umass?
