Module Name: src
Committed By: skrll
Date: Sat Apr 23 12:50:35 UTC 2016
Modified Files:
src/sys/conf: files
Log Message:
Merge nick-nhusb (missed commit)
To generate a diff of this commit:
cvs rdiff -u -r1.1154 -r1.1155 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1154 src/sys/conf/files:1.1155
--- src/sys/conf/files:1.1154 Tue Apr 12 11:51:08 2016
+++ src/sys/conf/files Sat Apr 23 12:50:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1154 2016/04/12 11:51:08 christos Exp $
+# $NetBSD: files,v 1.1155 2016/04/23 12:50:35 skrll Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20150846
@@ -1230,10 +1230,8 @@ define sdmmcbus { } # SD/MMC attachmen
# use them in an 'attach-with'.
#
-defparam USB_MEM_RESERVE
-
define usbroothub
-file dev/usb/usbroothub_subr.c usbroothub
+file dev/usb/usbroothub.c usbroothub
define usb_dma
@@ -1259,7 +1257,7 @@ file dev/usb/xhci.c xhci needs-flag
# Mentor graphics OTG IP
defflag opt_motg.h MOTG_ALLWINNER
-device motg: usbus, usbroothub, usb_dma
+device motg: usbus, usbroothub
file dev/usb/motg.c motg needs-flag
# SL811HS/T USB controller
