summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuo <yuo@openbsd.org>2008-10-08 17:17:15 +0000
committeryuo <yuo@openbsd.org>2008-10-08 17:17:15 +0000
commit11b62dc692fc5d8fee6cc9593787988154e7b301 (patch)
tree4d39e7d9572034bed553762d40778760b7d90483
parentFor "gunzip -N", the name stored in the gzip header has no directory, (diff)
downloadwireguard-openbsd-11b62dc692fc5d8fee6cc9593787988154e7b301.tar.xz
wireguard-openbsd-11b62dc692fc5d8fee6cc9593787988154e7b301.zip
As the Option N.V. Globetrotter HSDPA Modem is not compatible
with ubsa(4), it is moved to umsm(4). ok jsg@, reported by Daniele Pilenga
-rw-r--r--sys/dev/usb/ubsa.c4
-rw-r--r--sys/dev/usb/umsm.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 127fe15917b..a0a3863f53f 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsa.c,v 1.38 2008/10/03 15:10:02 deraadt Exp $ */
+/* $OpenBSD: ubsa.c,v 1.39 2008/10/08 17:17:15 yuo Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -225,8 +225,6 @@ const struct usb_devno ubsa_devs[] = {
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD },
/* Option GlobeTrotter 3G QUAD PLUS */
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUADPLUS },
- /* Option GlobeTrotter HSDPA */
- { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_SCORPION },
/* Option GlobeTrotter MAX 3.6/7.2 */
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36 },
/* Peracom */
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 51620e879a4..7087a185e1f 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umsm.c,v 1.33 2008/07/30 15:40:39 canacar Exp $ */
+/* $OpenBSD: umsm.c,v 1.34 2008/10/08 17:17:15 yuo Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -128,6 +128,7 @@ static const struct umsm_type umsm_devs[] = {
{{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS }, 0},
{{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GSICON72 }, DEV_UMASS1},
{{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTHSDPA225 }, DEV_UMASS2},
+ {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_SCORPION }, 0},
{{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_DRIVER }, DEV_UMASS1},
{{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA }, 0},
{{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA2 }, 0},