From owner-svn-src-stable@FreeBSD.ORG  Sun Jul 25 21:38:23 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 079DB106566C;
	Sun, 25 Jul 2010 21:38:23 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0EE7C8FC12;
	Sun, 25 Jul 2010 21:38:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6PLcMDo067126;
	Sun, 25 Jul 2010 21:38:22 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6PLcMa4067123;
	Sun, 25 Jul 2010 21:38:22 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201007252138.o6PLcMa4067123@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 25 Jul 2010 21:38:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210485 - in stable/8/sys/dev/usb: . wlan
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jul 2010 21:38:23 -0000

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),