Author: gavin
Date: Sun Jul 25 21:38:22 2010
New Revision: 210485
URL: http://svn.freebsd.org/changeset/base/210485
Log:
Merge r209447 (by thompsa) from head:
Add new device id.
PR: usb/147190
Modified:
stable/8/sys/dev/usb/usbdevs
stable/8/sys/dev/usb/wlan/if_upgt.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs Sun Jul 25 21:35:56 2010 (r210484)
+++ stable/8/sys/dev/usb/usbdevs Sun Jul 25 21:38:22 2010 (r210485)
@@ -3057,6 +3057,7 @@ product UNKNOWN4 USBMEMSTICK 0x6025 Flas
product UNKNOWN5 USB2IDEBRIDGE 0x00ff USB 2.0 ATA/SATA Bridge
/* U.S. Robotics products */
+product USR USR5422 0x0118 USR5422 WLAN
product USR USR5423 0x0121 USR5423 WLAN
/* VIA Technologies products */
Modified: stable/8/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_upgt.c Sun Jul 25 21:35:56 2010 (r210484)
+++ stable/8/sys/dev/usb/wlan/if_upgt.c Sun Jul 25 21:38:22 2010 (r210485)
@@ -184,6 +184,7 @@ static const struct usb_device_id upgt_d
UPGT_DEV(GLOBESPAN, PRISM_GT_2),
UPGT_DEV(INTERSIL, PRISM_GT),
UPGT_DEV(SMC, 2862WG),
+ UPGT_DEV(USR, USR5422),
UPGT_DEV(WISTRONNEWEB, UR045G),
UPGT_DEV(XYRATEX, PRISM_GT_1),
UPGT_DEV(XYRATEX, PRISM_GT_2),