summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_rum.c5
-rw-r--r--sys/dev/usb/usbdevs3
-rw-r--r--sys/dev/usb/usbdevs.h5
-rw-r--r--sys/dev/usb/usbdevs_data.h10
4 files changed, 15 insertions, 8 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 71a6119eec2..fc5b7e70701 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.22 2008/07/08 08:44:55 uebayasi Exp $ */
+/* $NetBSD: if_rum.c,v 1.23 2008/10/21 12:21:46 jun Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.22 2008/07/08 08:44:55 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.23 2008/10/21 12:21:46 jun Exp $");
#include "bpfilter.h"
@@ -102,6 +102,7 @@ static const struct usb_devno rum_devs[] = {
{ USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR },
{ USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54RU2 },
{ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB2GL },
+ { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB2GPX },
{ USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_CWD854F },
{ USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_RT2573 },
{ USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1 },
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 252dec28823..74f0b6c30fd 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp $
+$NetBSD: usbdevs,v 1.517 2008/10/21 12:20:44 jun Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -872,6 +872,7 @@ product COREGA WLANUSB 0x0012 Wireless LAN USB Stick-11
product COREGA FETHER_USB2_TX 0x0017 FEther USB2-TX
product COREGA WLUSB_11_KEY 0x001a ULUSB-11 Key
product COREGA CGWLUSB2GL 0x002d CG-WLUSB2GL
+product COREGA CGWLUSB2GPX 0x002e CG-WLUSB2GPX
product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC
/* Creative products */
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 928e87358b2..aea4597c8fb 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.511 2008/10/19 11:37:44 joerg Exp $ */
+/* $NetBSD: usbdevs.h,v 1.512 2008/10/21 12:21:46 jun Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp
+ * NetBSD: usbdevs,v 1.517 2008/10/21 12:20:44 jun Exp
*/
/*
@@ -879,6 +879,7 @@
#define USB_PRODUCT_COREGA_FETHER_USB2_TX 0x0017 /* FEther USB2-TX */
#define USB_PRODUCT_COREGA_WLUSB_11_KEY 0x001a /* ULUSB-11 Key */
#define USB_PRODUCT_COREGA_CGWLUSB2GL 0x002d /* CG-WLUSB2GL */
+#define USB_PRODUCT_COREGA_CGWLUSB2GPX 0x002e /* CG-WLUSB2GPX */
#define USB_PRODUCT_COREGA_FETHER_USB_TXC 0x9601 /* FEther USB-TXC */
/* Creative products */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 4b73a95a0d9..d032f2b35f4 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.512 2008/10/19 11:37:44 joerg Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.513 2008/10/21 12:21:46 jun Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.516 2008/10/19 11:36:11 joerg Exp
+ * NetBSD: usbdevs,v 1.517 2008/10/21 12:20:44 jun Exp
*/
/*
@@ -2759,6 +2759,10 @@ const struct usb_product usb_products[] = {
"CG-WLUSB2GL",
},
{
+ USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB2GPX,
+ "CG-WLUSB2GPX",
+ },
+ {
USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC,
"FEther USB-TXC",
},
@@ -6803,4 +6807,4 @@ const struct usb_product usb_products[] = {
"Prestige",
},
};
-const int usb_nproducts = 1237;
+const int usb_nproducts = 1238;