Module Name: src
Committed By: skrll
Date: Wed Dec 3 22:33:56 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: if_atu.c if_aue.c if_cue.c if_rum.c
if_upl.c if_ural.c if_urtw.c if_urtwn.c pseye.c slurm.c uberry.c
uipad.c umct.c umidi_quirks.c ums.c usbdi.c usscanner.c uthum.c
utoppy.c uts.c uvideo.c xhci.c
Log Message:
Remove #include <sys/malloc.h> where it's not (no longer) needed
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.3 -r1.50.2.4 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.132.4.2 -r1.132.4.3 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.68.4.2 -r1.68.4.3 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.48.6.1 -r1.48.6.2 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.47.4.2 -r1.47.4.3 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.44.14.1 -r1.44.14.2 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.6.6.1 -r1.6.6.2 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.34.4.2 -r1.34.4.3 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.21.34.3 -r1.21.34.4 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.1 -r1.1.18.1 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.9.14.1 -r1.9.14.2 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.1.28.1 -r1.1.28.2 src/sys/dev/usb/uipad.c
cvs rdiff -u -r1.32.24.3 -r1.32.24.4 src/sys/dev/usb/umct.c
cvs rdiff -u -r1.18.16.1 -r1.18.16.2 src/sys/dev/usb/umidi_quirks.c
cvs rdiff -u -r1.87.6.2 -r1.87.6.3 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.162.2.7 -r1.162.2.8 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.38.6.3 -r1.38.6.4 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.10 -r1.10.14.1 src/sys/dev/usb/uthum.c
cvs rdiff -u -r1.24.4.3 -r1.24.4.4 src/sys/dev/usb/utoppy.c
cvs rdiff -u -r1.3.14.1 -r1.3.14.2 src/sys/dev/usb/uts.c
cvs rdiff -u -r1.41.2.3 -r1.41.2.4 src/sys/dev/usb/uvideo.c
cvs rdiff -u -r1.28.2.8 -r1.28.2.9 src/sys/dev/usb/xhci.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/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.50.2.3 src/sys/dev/usb/if_atu.c:1.50.2.4
--- src/sys/dev/usb/if_atu.c:1.50.2.3 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/if_atu.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.50.2.3 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: if_atu.c,v 1.50.2.4 2014/12/03 22:33:56 skrll Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.50.2.3 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.50.2.4 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kthread.h>
#include <sys/queue.h>
#include <sys/device.h>
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.4.2 src/sys/dev/usb/if_aue.c:1.132.4.3
--- src/sys/dev/usb/if_aue.c:1.132.4.2 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_aue.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.132.4.2 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_aue.c,v 1.132.4.3 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.2 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.3 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1
#include <sys/sockio.h>
#include <sys/mutex.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.68.4.2 src/sys/dev/usb/if_cue.c:1.68.4.3
--- src/sys/dev/usb/if_cue.c:1.68.4.2 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_cue.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.68.4.2 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_cue.c,v 1.68.4.3 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.4.2 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.68.4.3 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -67,7 +67,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1
#include <sys/callout.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/bus.h>
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.48.6.1 src/sys/dev/usb/if_rum.c:1.48.6.2
--- src/sys/dev/usb/if_rum.c:1.48.6.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_rum.c Wed Dec 3 22:33:56 2014
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.48.6.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_rum.c,v 1.48.6.2 2014/12/03 22:33:56 skrll Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <[email protected]>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -33,7 +33,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/device.h>
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.47.4.2 src/sys/dev/usb/if_upl.c:1.47.4.3
--- src/sys/dev/usb/if_upl.c:1.47.4.2 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_upl.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.47.4.2 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_upl.c,v 1.47.4.3 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.4.2 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.47.4.3 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1
#include <sys/callout.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.44.14.1 src/sys/dev/usb/if_ural.c:1.44.14.2
--- src/sys/dev/usb/if_ural.c:1.44.14.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_ural.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.44.14.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_ural.c,v 1.44.14.2 2014/12/03 22:33:56 skrll Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -33,7 +33,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_ural.c,v
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/device.h>
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.6.6.1 src/sys/dev/usb/if_urtw.c:1.6.6.2
--- src/sys/dev/usb/if_urtw.c:1.6.6.1 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_urtw.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.6.6.1 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.6.6.2 2014/12/03 22:33:56 skrll Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.1 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -28,7 +28,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/callout.h>
#include <sys/conf.h>
#include <sys/device.h>
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.34.4.2 src/sys/dev/usb/if_urtwn.c:1.34.4.3
--- src/sys/dev/usb/if_urtwn.c:1.34.4.2 Wed Dec 3 11:24:44 2014
+++ src/sys/dev/usb/if_urtwn.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.34.4.2 2014/12/03 11:24:44 skrll Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.34.4.3 2014/12/03 22:33:56 skrll Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.2 2014/12/03 11:24:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.34.4.3 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/conf.h>
#include <sys/device.h>
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.21.34.3 src/sys/dev/usb/pseye.c:1.21.34.4
--- src/sys/dev/usb/pseye.c:1.21.34.3 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/pseye.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.21.34.3 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: pseye.c,v 1.21.34.4 2014/12/03 22:33:56 skrll Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <[email protected]>
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21.34.3 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.21.34.4 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/poll.h>
Index: src/sys/dev/usb/slurm.c
diff -u src/sys/dev/usb/slurm.c:1.1 src/sys/dev/usb/slurm.c:1.1.18.1
--- src/sys/dev/usb/slurm.c:1.1 Sun Jan 13 01:15:02 2013
+++ src/sys/dev/usb/slurm.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: slurm.c,v 1.1 2013/01/13 01:15:02 jakllsch Exp $ */
+/* $NetBSD: slurm.c,v 1.1.18.1 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,13 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1 2013/01/13 01:15:02 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.1.18.1 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.9.14.1 src/sys/dev/usb/uberry.c:1.9.14.2
--- src/sys/dev/usb/uberry.c:1.9.14.1 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/uberry.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.9.14.1 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: uberry.c,v 1.9.14.2 2014/12/03 22:33:56 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9.14.1 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9.14.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/uipad.c
diff -u src/sys/dev/usb/uipad.c:1.1.28.1 src/sys/dev/usb/uipad.c:1.1.28.2
--- src/sys/dev/usb/uipad.c:1.1.28.1 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/uipad.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipad.c,v 1.1.28.1 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: uipad.c,v 1.1.28.2 2014/12/03 22:33:56 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -37,12 +37,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.1.28.1 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipad.c,v 1.1.28.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.32.24.3 src/sys/dev/usb/umct.c:1.32.24.4
--- src/sys/dev/usb/umct.c:1.32.24.3 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/umct.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.32.24.3 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: umct.c,v 1.32.24.4 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,12 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.3 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.4 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
#include <sys/tty.h>
Index: src/sys/dev/usb/umidi_quirks.c
diff -u src/sys/dev/usb/umidi_quirks.c:1.18.16.1 src/sys/dev/usb/umidi_quirks.c:1.18.16.2
--- src/sys/dev/usb/umidi_quirks.c:1.18.16.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/umidi_quirks.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.18.16.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.18.16.2 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.18.16.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.18.16.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.87.6.2 src/sys/dev/usb/ums.c:1.87.6.3
--- src/sys/dev/usb/ums.c:1.87.6.2 Sun Nov 30 13:14:11 2014
+++ src/sys/dev/usb/ums.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.87.6.2 2014/11/30 13:14:11 skrll Exp $ */
+/* $NetBSD: ums.c,v 1.87.6.3 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,12 +35,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87.6.2 2014/11/30 13:14:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87.6.3 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/file.h>
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.7 src/sys/dev/usb/usbdi.c:1.162.2.8
--- src/sys/dev/usb/usbdi.c:1.162.2.7 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/usbdi.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.7 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.8 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.7 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.8 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/kmem.h>
#include <sys/proc.h>
#include <sys/bus.h>
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.6.3 src/sys/dev/usb/usscanner.c:1.38.6.4
--- src/sys/dev/usb/usscanner.c:1.38.6.3 Tue Dec 2 09:00:34 2014
+++ src/sys/dev/usb/usscanner.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.38.6.3 2014/12/02 09:00:34 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.38.6.4 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,14 +47,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.3 2014/12/02 09:00:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.4 2014/12/03 22:33:56 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lwp.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/buf.h>
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.10 src/sys/dev/usb/uthum.c:1.10.14.1
--- src/sys/dev/usb/uthum.c:1.10 Sat Jan 5 23:34:21 2013
+++ src/sys/dev/usb/uthum.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.10 2013/01/05 23:34:21 christos Exp $ */
+/* $NetBSD: uthum.c,v 1.10.14.1 2014/12/03 22:33:56 skrll Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,13 +22,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10 2013/01/05 23:34:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.14.1 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.24.4.3 src/sys/dev/usb/utoppy.c:1.24.4.4
--- src/sys/dev/usb/utoppy.c:1.24.4.3 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/utoppy.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.24.4.3 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: utoppy.c,v 1.24.4.4 2014/12/03 22:33:56 skrll Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.24.4.3 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.24.4.4 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1
#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/device.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/conf.h>
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.3.14.1 src/sys/dev/usb/uts.c:1.3.14.2
--- src/sys/dev/usb/uts.c:1.3.14.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uts.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.3.14.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uts.c,v 1.3.14.2 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,12 +34,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.3.14.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.3.14.2 2014/12/03 22:33:56 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/vnode.h>
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.41.2.3 src/sys/dev/usb/uvideo.c:1.41.2.4
--- src/sys/dev/usb/uvideo.c:1.41.2.3 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/uvideo.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.41.2.3 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.41.2.4 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.3 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.4 2014/12/03 22:33:56 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-/* #include <sys/malloc.h> */
#include <sys/kmem.h>
#include <sys/device.h>
#include <sys/ioctl.h>
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.8 src/sys/dev/usb/xhci.c:1.28.2.9
--- src/sys/dev/usb/xhci.c:1.28.2.8 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/xhci.c Wed Dec 3 22:33:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.8 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.9 2014/12/03 22:33:56 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.8 2014/12/03 14:18:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.9 2014/12/03 22:33:56 skrll Exp $");
#include "opt_usb.h"
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.2
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/select.h>
#include <sys/proc.h>
