Module Name: src
Committed By: skrll
Date: Mon Sep 21 07:14:16 UTC 2015
Modified Files:
src/sys/arch/amd64/conf [nick-nhusb]: GENERIC
src/sys/arch/i386/conf [nick-nhusb]: GENERIC
Log Message:
Enable xhci(4)
To generate a diff of this commit:
cvs rdiff -u -r1.404.2.2 -r1.404.2.3 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1118.2.2 -r1.1118.2.3 src/sys/arch/i386/conf/GENERIC
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/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.404.2.2 src/sys/arch/amd64/conf/GENERIC:1.404.2.3
--- src/sys/arch/amd64/conf/GENERIC:1.404.2.2 Sat Jun 6 14:39:54 2015
+++ src/sys/arch/amd64/conf/GENERIC Mon Sep 21 07:14:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.404.2.2 2015/06/06 14:39:54 skrll Exp $
+# $NetBSD: GENERIC,v 1.404.2.3 2015/09/21 07:14:16 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.404.2.2 $"
+#ident "GENERIC-$Revision: 1.404.2.3 $"
maxusers 64 # estimated number of users
@@ -844,7 +844,7 @@ urlphy* at mii? phy ? # Realtek RTL815
# 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
@@ -862,7 +862,7 @@ uhci* at cardbus? function ? # Universa
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
-# usb* at xhci?
+usb* at xhci?
usb* at ehci?
usb* at ohci?
usb* at uhci?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1118.2.2 src/sys/arch/i386/conf/GENERIC:1.1118.2.3
--- src/sys/arch/i386/conf/GENERIC:1.1118.2.2 Sat Jun 6 14:40:00 2015
+++ src/sys/arch/i386/conf/GENERIC Mon Sep 21 07:14:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1118.2.2 2015/06/06 14:40:00 skrll Exp $
+# $NetBSD: GENERIC,v 1.1118.2.3 2015/09/21 07:14:16 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1118.2.2 $"
+#ident "GENERIC-$Revision: 1.1118.2.3 $"
maxusers 64 # estimated number of users
@@ -1144,7 +1144,7 @@ urlphy* at mii? phy ? # Realtek RTL815
# 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
gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC)
@@ -1163,7 +1163,7 @@ uhci* at cardbus? function ? # Universa
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
-# usb* at xhci?
+usb* at xhci?
usb* at ehci?
usb* at gcscehci?
usb* at ohci?
