From owner-svn-src-stable-8@FreeBSD.ORG Mon Jun 27 21:30:05 2011 Return-Path: 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 733401065673; Mon, 27 Jun 2011 21:30:05 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C21A8FC0A; Mon, 27 Jun 2011 21:30:05 +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 p5RLU5K5014639; Mon, 27 Jun 2011 21:30:05 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5RLU5og014637; Mon, 27 Jun 2011 21:30:05 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201106272130.p5RLU5og014637@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 27 Jun 2011 21:30:05 +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: r223609 - in 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2011 21:30:05 -0000 Author: hselasky Date: Mon Jun 27 21:30:04 2011 New Revision: 223609 URL: http://svn.freebsd.org/changeset/base/223609 Log: MFC r219257: Add new USB ID. PR: usb/155229 Modified: stable/8/sys/dev/usb/usbdevs stable/8/sys/dev/usb/wlan/if_run.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/usbdevs ============================================================================== --- stable/8/sys/dev/usb/usbdevs Mon Jun 27 21:27:12 2011 (r223608) +++ stable/8/sys/dev/usb/usbdevs Mon Jun 27 21:30:04 2011 (r223609) @@ -2160,6 +2160,7 @@ product MELCO WLIUCG 0x0137 WLI-UC-G product MELCO RT2870_1 0x0148 RT2870 product MELCO RT2870_2 0x0150 RT2870 product MELCO WLIUCGN 0x015d WLI-UC-GN +product MELCO WLIUCG301N 0x016f WLI-UC-G301N /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 Modified: stable/8/sys/dev/usb/wlan/if_run.c ============================================================================== --- stable/8/sys/dev/usb/wlan/if_run.c Mon Jun 27 21:27:12 2011 (r223608) +++ stable/8/sys/dev/usb/wlan/if_run.c Mon Jun 27 21:30:04 2011 (r223609) @@ -210,6 +210,7 @@ static const STRUCT_USB_HOST_ID run_devs RUN_DEV(MELCO, RT2870_2), RUN_DEV(MELCO, WLIUCAG300N), RUN_DEV(MELCO, WLIUCG300N), + RUN_DEV(MELCO, WLIUCG301N), RUN_DEV(MELCO, WLIUCGN), RUN_DEV(MOTOROLA4, RT2770), RUN_DEV(MOTOROLA4, RT3070),