Author: hselasky
Date: Sat Dec 31 15:14:07 2011
New Revision: 229115
URL: http://svn.freebsd.org/changeset/base/229115
Log:
MFC r227781:
Add new USB IDs.
PR: usb/162712, usb/163732
Modified:
stable/9/sys/dev/usb/usbdevs
stable/9/sys/dev/usb/wlan/if_run.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:11:47 2011
(r229114)
+++ stable/9/sys/dev/usb/usbdevs Sat Dec 31 15:14:07 2011
(r229115)
@@ -2084,6 +2084,7 @@ product LINKSYS4 RT3070 0x0078 RT3070
product LINKSYS4 WUSB600NV2 0x0079 WUSB600N v2
/* Logitech products */
+product LOGITECH LANW300NU2 0x0166 LAN-W300N/U2
product LOGITECH M2452 0x0203 M2452 keyboard
product LOGITECH M4848 0x0301 M4848 mouse
product LOGITECH PAGESCAN 0x040f PageScan
@@ -2179,6 +2180,7 @@ 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
+product MELCO WLIUCGNM 0x01a2 WLI-UC-GNM
/* Merlin products */
product MERLIN V620 0x1110 Merlin V620
Modified: stable/9/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:11:47 2011
(r229114)
+++ stable/9/sys/dev/usb/wlan/if_run.c Sat Dec 31 15:14:07 2011
(r229115)
@@ -208,12 +208,14 @@ static const STRUCT_USB_HOST_ID run_devs
RUN_DEV(LOGITEC, RT2870_1),
RUN_DEV(LOGITEC, RT2870_2),
RUN_DEV(LOGITEC, RT2870_3),
+ RUN_DEV(LOGITECH, LANW300NU2),
RUN_DEV(MELCO, RT2870_1),
RUN_DEV(MELCO, RT2870_2),
RUN_DEV(MELCO, WLIUCAG300N),
RUN_DEV(MELCO, WLIUCG300N),
RUN_DEV(MELCO, WLIUCG301N),
RUN_DEV(MELCO, WLIUCGN),
+ RUN_DEV(MELCO, WLIUCGNM),
RUN_DEV(MOTOROLA4, RT2770),
RUN_DEV(MOTOROLA4, RT3070),
RUN_DEV(MSI, RT3070_1),
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
