[src/trunk]: src/sys/conf Merge nick-nhusb (missed commit)

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca3f184fb8e9
branches:  trunk
changeset: 344830:ca3f184fb8e9
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Apr 23 12:50:35 2016 +0000

description:
Merge nick-nhusb (missed commit)

diffstat:

 sys/conf/files |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r b1b6a62bd22a -r ca3f184fb8e9 sys/conf/files
--- a/sys/conf/files    Sat Apr 23 12:26:29 2016 +0000
+++ b/sys/conf/files    Sat Apr 23 12:50:35 2016 +0000
@@ -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 @@
 # 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 @@
 
 # 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