summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorFelix Kronlage <fkr@cvs.openbsd.org>2008-11-21 21:10:04 +0000
committerFelix Kronlage <fkr@cvs.openbsd.org>2008-11-21 21:10:04 +0000
commit859a6fe88205894b0d1e783bbb5d77e38a0c3776 (patch)
treef394994362ca87dd4c2b6ecf2cc15b78c68d563f /sys/dev
parentb23425fac9bbf452722c52a20c4494ae4136430e (diff)
move Option Globetrotter GT Fusion from ubsa(4) to umsm(4) since it
does CDC. discussed with yuo@ and jsg@.
Diffstat (limited to 'sys/dev')
-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 a0a3863f53f..3b413a87fbc 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsa.c,v 1.39 2008/10/08 17:17:15 yuo Exp $ */
+/* $OpenBSD: ubsa.c,v 1.40 2008/11/21 21:10:03 fkr Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -219,8 +219,6 @@ const struct usb_devno ubsa_devs[] = {
{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_MERLINU740 },
/* Option Vodafone Mobile Connect 3G */
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G },
- /* Option GlobeTrotter 3G FUSION */
- { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION },
/* Option GlobeTrotter 3G QUAD */
{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD },
/* Option GlobeTrotter 3G QUAD PLUS */
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 55477c0a86b..9b4733a936c 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umsm.c,v 1.35 2008/11/07 20:49:21 deraadt Exp $ */
+/* $OpenBSD: umsm.c,v 1.36 2008/11/21 21:10:03 fkr Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -125,6 +125,7 @@ static const struct umsm_type umsm_devs[] = {
{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_U720 }, 0},
{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_XU870 }, 0},
{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620 }, 0},
+ {{ USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GFUSION }, 0},
{{ 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},