summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2011-11-06 02:29:33 +0000
committerchristos <christos@NetBSD.org>2011-11-06 02:29:33 +0000
commit1015ff68aa53151f11db96fbc43fb2e5b06a3a22 (patch)
treea28168ca0cbcbd88b547f4fce9d3c9368d66d66f /sys/dev
parentc5d457032661502f1d2cbea812ac64f4702f7783 (diff)
PR/45156: Moritz Wilhelmy: XS Stick P14 amendment
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/u3g.c6
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb/u3g.c b/sys/dev/usb/u3g.c
index 25f062588a5..bc0400d0bb0 100644
--- a/sys/dev/usb/u3g.c
+++ b/sys/dev/usb/u3g.c
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.20 2011/09/30 18:59:04 christos Exp $ */
+/* $NetBSD: u3g.c,v 1.21 2011/11/06 02:29:33 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.20 2011/09/30 18:59:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.21 2011/11/06 02:29:33 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -506,7 +506,7 @@ u3ginit_match(device_t parent, cfdata_t match, void *aux)
break;
case USB_VENDOR_4GSYSTEMS:
- if (uaa->product == USB_PRODUCT_4GSYSTEMS_XSSTICK_P14)
+ if (uaa->product == USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER)
return u3g_4gsystems_reinit(uaa->device);
break;
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index d390c2a8e66..0bd900f8d06 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.599 2011/11/02 04:59:51 macallan Exp $
+$NetBSD: usbdevs,v 1.600 2011/11/06 02:29:33 christos Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -576,6 +576,7 @@ product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro
/* 4G Systems products */
product 4GSYSTEMS XSSTICK_P14 0x9605 4G Systems XSStick P14
+product 4GSYSTEMS XSSTICK_P14_INSTALLER 0xf000 4G Systems XSStick P14 - Windows driver
/* ACDC products */
product ACDC HUB 0x2315 USB Pen Drive HUB