svn commit: r275635 - in projects/clang350-import/sys: dev/usb/controller sys

[Dimitry Andric]

Author: dim
Date: Tue Dec  9 07:55:37 2014
New Revision: 275635
URL: https://svnweb.freebsd.org/changeset/base/275635

Log:
  Merge ^/head r275623 through 275634.

Modified:
  projects/clang350-import/sys/dev/usb/controller/xhci_pci.c
  projects/clang350-import/sys/sys/param.h
Directory Properties:
  projects/clang350-import/   (props changed)
  projects/clang350-import/contrib/llvm/   (props changed)
  projects/clang350-import/sys/   (props changed)

Modified: projects/clang350-import/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- projects/clang350-import/sys/dev/usb/controller/xhci_pci.c	Tue Dec  9 07:48:25 2014	(r275634)
+++ projects/clang350-import/sys/dev/usb/controller/xhci_pci.c	Tue Dec  9 07:55:37 2014	(r275635)
@@ -252,6 +252,7 @@ xhci_pci_attach(device_t self)
 	case 0x9c318086:	/* Panther Point */
 	case 0x1e318086:	/* Panther Point */
 	case 0x8c318086:	/* Lynx Point */
+	case 0x8cb18086:	/* Wildcat Point */
 		sc->sc_port_route = &xhci_pci_port_route;
 		sc->sc_imod_default = XHCI_IMOD_DEFAULT_LP;
 		break;

Modified: projects/clang350-import/sys/sys/param.h
==============================================================================
--- projects/clang350-import/sys/sys/param.h	Tue Dec  9 07:48:25 2014	(r275634)
+++ projects/clang350-import/sys/sys/param.h	Tue Dec  9 07:55:37 2014	(r275635)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100048	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100050	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,