svn commit: r211493 - stable/7/sys/dev/usb

[Gavin Atkinson]

Author: gavin
Date: Thu Aug 19 08:11:07 2010
New Revision: 211493
URL: http://svn.freebsd.org/changeset/base/211493

Log:
  Merge r186427 from head (original commit by remko):
    Add support for the MaxSream USB test carrier.
  
  PR:		usb/117546
  Submitted by:	Daniel J. O'Connor <darius midget.dons.net.au>

Modified:
  stable/7/sys/dev/usb/uftdi.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/usb/uftdi.c
==============================================================================
--- stable/7/sys/dev/usb/uftdi.c	Thu Aug 19 08:03:35 2010	(r211492)
+++ stable/7/sys/dev/usb/uftdi.c	Thu Aug 19 08:11:07 2010	(r211493)
@@ -171,7 +171,8 @@ uftdi_match(device_t self)
 	     uaa->product == USB_PRODUCT_FTDI_UOPTBR ||
 	     uaa->product == USB_PRODUCT_FTDI_EMCU2D ||
 	     uaa->product == USB_PRODUCT_FTDI_PCMSFU ||
-	     uaa->product == USB_PRODUCT_FTDI_EMCU2H ))
+	     uaa->product == USB_PRODUCT_FTDI_EMCU2H ||
+	     uaa->product == USB_PRODUCT_FTDI_MAXSTREAM ))
 		return (UMATCH_VENDOR_PRODUCT);
 	if (uaa->vendor == USB_VENDOR_SIIG2 &&
 	    (uaa->product == USB_PRODUCT_SIIG2_US2308))