From 90124c33cf4af0e326e5e840ce580892daafc9bf Mon Sep 17 00:00:00 2001 From: Felix Kronlage Date: Sun, 23 Nov 2008 14:32:35 +0000 Subject: move another Option modem from ubsa(4) to umsm(4), as umsm(4) supports this much better. ok yuo@ --- sys/dev/usb/ubsa.c | 4 +--- sys/dev/usb/umsm.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 3b413a87fbc..044a7f5f461 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.40 2008/11/21 21:10:03 fkr Exp $ */ +/* $OpenBSD: ubsa.c,v 1.41 2008/11/23 14:32:34 fkr Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev . @@ -223,8 +223,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 MAX 3.6/7.2 */ - { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GTMAX36 }, /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, /* Qualcomm Inc. ZTE CMDMA MSM modem */ diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index 58f8e827a79..234e3bce8d0 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.37 2008/11/23 14:20:01 fkr Exp $ */ +/* $OpenBSD: umsm.c,v 1.38 2008/11/23 14:32:34 fkr Exp $ */ /* * Copyright (c) 2008 Yojiro UO @@ -129,6 +129,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_GTMAX36 }, 0}, {{ 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}, -- cgit v1.2.3