From owner-svn-src-stable-8@FreeBSD.ORG  Sun Jul  3 21:05:11 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1ECE81065670;
	Sun,  3 Jul 2011 21:05:11 +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 0E1F38FC14;
	Sun,  3 Jul 2011 21:05:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p63L5AEY040280;
	Sun, 3 Jul 2011 21:05:10 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p63L5AI9040278;
	Sun, 3 Jul 2011 21:05:10 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201107032105.p63L5AI9040278@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 3 Jul 2011 21:05:10 +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: r223745 - stable/8/sys/dev/usb/wlan
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jul 2011 21:05:11 -0000

Author: gavin
Date: Sun Jul  3 21:05:10 2011
New Revision: 223745
URL: http://svn.freebsd.org/changeset/base/223745

Log:
  Merge r223446 from head:
  
    Use USB_VENDOR_OVISLINK define rather than the vendor ID.
  
  PR:		usb/158142
  Submitted by:	Robert Millan <rmh debian.org>

Modified:
  stable/8/sys/dev/usb/wlan/if_urtw.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)

Modified: stable/8/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_urtw.c	Sun Jul  3 20:59:57 2011	(r223744)
+++ stable/8/sys/dev/usb/wlan/if_urtw.c	Sun Jul  3 21:05:10 2011	(r223745)
@@ -115,7 +115,7 @@ static const STRUCT_USB_HOST_ID urtw_dev
 	URTW_DEV_L(REALTEK, RTL8187),
 	URTW_DEV_L(SITECOMEU, WL168V1),
 	URTW_DEV_L(SURECOM, EP9001G2A),
-	{ USB_VPI(0x1b75, 0x8187, URTW_REV_RTL8187L) },
+	{ USB_VPI(USB_VENDOR_OVISLINK, 0x8187, URTW_REV_RTL8187L) },
 	{ USB_VPI(USB_VENDOR_DICKSMITH, 0x9401, URTW_REV_RTL8187L) },
 	{ USB_VPI(USB_VENDOR_HP, 0xca02, URTW_REV_RTL8187L) },
 	{ USB_VPI(USB_VENDOR_LOGITEC, 0x010c, URTW_REV_RTL8187L) },