CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Wed Dec  3 13:30:51 UTC 2014

Modified Files:
        src/sys/dev/usb [nick-nhusb]: usb.h usb_subr.c

Log Message:
G/C M_USBHC


To generate a diff of this commit:
cvs rdiff -u -r1.111.2.2 -r1.111.2.3 src/sys/dev/usb/usb.h
cvs rdiff -u -r1.198.2.2 -r1.198.2.3 src/sys/dev/usb/usb_subr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.111.2.2 src/sys/dev/usb/usb.h:1.111.2.3
--- src/sys/dev/usb/usb.h:1.111.2.2	Sun Nov 30 16:39:51 2014
+++ src/sys/dev/usb/usb.h	Wed Dec  3 13:30:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb.h,v 1.111.2.2 2014/11/30 16:39:51 skrll Exp $	*/
+/*	$NetBSD: usb.h,v 1.111.2.3 2014/12/03 13:30:51 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 
 MALLOC_DECLARE(M_USB);
 MALLOC_DECLARE(M_USBDEV);
-MALLOC_DECLARE(M_USBHC);
 
 #include <sys/device.h>
 

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.2 src/sys/dev/usb/usb_subr.c:1.198.2.3
--- src/sys/dev/usb/usb_subr.c:1.198.2.2	Wed Dec  3 12:52:07 2014
+++ src/sys/dev/usb/usb_subr.c	Wed Dec  3 13:30:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.198.2.2 2014/12/03 12:52:07 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.198.2.3 2014/12/03 13:30:51 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.2 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.3 2014/12/03 13:30:51 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -73,7 +73,6 @@ extern int usbdebug;
 
 MALLOC_DEFINE(M_USB, "USB", "USB misc. memory");
 MALLOC_DEFINE(M_USBDEV, "USB device", "USB device driver");
-MALLOC_DEFINE(M_USBHC, "USB HC", "USB host controller");
 
 Static usbd_status usbd_set_config(usbd_device_handle, int);
 Static void usbd_devinfo(usbd_device_handle, int, char *, size_t);