Module Name: src
Committed By: martin
Date: Mon Feb 5 15:14:01 UTC 2018
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-8]: XEN3_DOM0
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #533):
sys/arch/i386/conf/XEN3_DOM0: revision 1.126
sys/arch/amd64/conf/XEN3_DOM0: revision 1.148
Follow GENERIC and enable xhci(4) by default. PR port-xen/52978
To generate a diff of this commit:
cvs rdiff -u -r1.135.4.5 -r1.135.4.6 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.112.4.6 -r1.112.4.7 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.5 src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.6
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.5 Mon Feb 5 13:06:55 2018
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Feb 5 15:14:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.135.4.5 2018/02/05 13:06:55 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.135.4.6 2018/02/05 15:14:00 martin Exp $
include "arch/amd64/conf/std.xen"
@@ -584,14 +584,14 @@ wsmouse* at pms? mux 0
# USB Controller and Devices
# PCI USB controllers
-# xhci* at pci? dev ? function ? # eXtensible Host Controller
+xhci* at pci? dev ? function ? # eXtensible Host Controller
# xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
-# usb* at xhci?
+usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.6 src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.7
--- src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.6 Fri Jan 26 14:28:14 2018
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Feb 5 15:14:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.112.4.6 2018/01/26 14:28:14 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.112.4.7 2018/02/05 15:14:00 martin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -553,14 +553,14 @@ wsmouse* at pms? mux 0
# USB Controller and Devices
# PCI USB controllers
-# xhci* at pci? dev ? function ? # eXtensible Host Controller
+xhci* at pci? dev ? function ? # eXtensible Host Controller
# xhci is at best experimental
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
-# usb* at xhci?
+usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
