summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ehci.c3
-rw-r--r--sys/dev/usb/if_aue.c3
-rw-r--r--sys/dev/usb/if_axe.c3
-rw-r--r--sys/dev/usb/if_cdce.c3
-rw-r--r--sys/dev/usb/if_kue.c3
-rw-r--r--sys/dev/usb/if_mos.c3
-rw-r--r--sys/dev/usb/if_smsc.c3
-rw-r--r--sys/dev/usb/if_udav.c3
-rw-r--r--sys/dev/usb/if_url.c3
-rw-r--r--sys/dev/usb/if_urndis.c3
-rw-r--r--sys/dev/usb/if_urtw.c3
-rw-r--r--sys/dev/usb/if_wi_usb.c3
-rw-r--r--sys/dev/usb/if_zyd.c3
-rw-r--r--sys/dev/usb/ohci.c3
-rw-r--r--sys/dev/usb/uaudio.c3
-rw-r--r--sys/dev/usb/ubsa.c3
-rw-r--r--sys/dev/usb/ubt.c3
-rw-r--r--sys/dev/usb/ucom.c3
-rw-r--r--sys/dev/usb/udcf.c4
-rw-r--r--sys/dev/usb/udl.c3
-rw-r--r--sys/dev/usb/ugen.c3
-rw-r--r--sys/dev/usb/uhci.c3
-rw-r--r--sys/dev/usb/uhts.c3
-rw-r--r--sys/dev/usb/uhub.c3
-rw-r--r--sys/dev/usb/ulpt.c3
-rw-r--r--sys/dev/usb/umbg.c4
-rw-r--r--sys/dev/usb/umct.c3
-rw-r--r--sys/dev/usb/umidi.c3
-rw-r--r--sys/dev/usb/umidi_quirks.c3
-rw-r--r--sys/dev/usb/umodem.c3
-rw-r--r--sys/dev/usb/uoak_subr.c3
-rw-r--r--sys/dev/usb/uoaklux.c3
-rw-r--r--sys/dev/usb/uoakrh.c3
-rw-r--r--sys/dev/usb/uoakv.c3
-rw-r--r--sys/dev/usb/uow.c3
-rw-r--r--sys/dev/usb/uplcom.c3
-rw-r--r--sys/dev/usb/urio.c3
-rw-r--r--sys/dev/usb/usb.c3
-rw-r--r--sys/dev/usb/usb_mem.c6
-rw-r--r--sys/dev/usb/usb_subr.c3
-rw-r--r--sys/dev/usb/usbdi.c3
-rw-r--r--sys/dev/usb/usbdi_util.c3
-rw-r--r--sys/dev/usb/usbdivar.h4
-rw-r--r--sys/dev/usb/usbf_subr.c3
-rw-r--r--sys/dev/usb/uscanner.c3
-rw-r--r--sys/dev/usb/usps.c3
-rw-r--r--sys/dev/usb/uthum.c3
-rw-r--r--sys/dev/usb/utrh.c3
-rw-r--r--sys/dev/usb/utwitch.c3
-rw-r--r--sys/dev/usb/uvideo.c3
-rw-r--r--sys/dev/usb/uvscom.c3
51 files changed, 55 insertions, 104 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 20788ef7463..0c8fbc6f1cf 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.128 2012/10/09 13:41:04 deraadt Exp $ */
+/* $OpenBSD: ehci.c,v 1.129 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@@ -56,7 +56,6 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <sys/timeout.h>
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index a44f37f69f0..684f78f1ed9 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.85 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: if_aue.c,v 1.86 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -85,7 +85,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 9f582eb1a95..a66a7d31fdf 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.116 2013/03/04 13:08:06 sthen Exp $ */
+/* $OpenBSD: if_axe.c,v 1.117 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -95,7 +95,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index f7df1cdc0f6..6820c92bca8 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdce.c,v 1.51 2011/11/09 21:45:50 sthen Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.52 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -49,7 +49,6 @@
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 80076308bc2..890ff843c06 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_kue.c,v 1.64 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: if_kue.c,v 1.65 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -80,7 +80,6 @@
#include <sys/kernel.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index 0dafb22225b..3cadf8a6e87 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mos.c,v 1.18 2012/12/05 23:20:21 deraadt Exp $ */
+/* $OpenBSD: if_mos.c,v 1.19 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -78,7 +78,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index 36e102230be..3c52ecce080 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_smsc.c,v 1.5 2012/11/10 18:48:22 brad Exp $ */
+/* $OpenBSD: if_smsc.c,v 1.6 2013/03/28 03:58:03 tedu Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
/*-
* Copyright (c) 2012
@@ -67,7 +67,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 83275c02d51..f46cb507792 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.60 2013/01/29 02:06:55 brad Exp $ */
+/* $OpenBSD: if_udav.c,v 1.61 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -50,7 +50,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 3aec42fc4d6..b2fa946b415 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.64 2013/01/29 11:06:38 brad Exp $ */
+/* $OpenBSD: if_url.c,v 1.65 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -49,7 +49,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index a613b14ef4a..6df4108fd2a 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urndis.c,v 1.36 2013/02/02 15:03:58 fgsch Exp $ */
+/* $OpenBSD: if_urndis.c,v 1.37 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -27,7 +27,6 @@
#include <sys/rwlock.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index ea7cdaa6bd4..0d0917fc3d0 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: if_urtw.c,v 1.40 2013/03/28 03:58:03 tedu Exp $ */
/*-
* Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -21,7 +21,6 @@
#include <sys/param.h>
#include <sys/sockio.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 7f11acaa788..09a63c6f666 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.55 2011/12/03 03:34:40 krw Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.56 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -35,7 +35,6 @@
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/timeout.h>
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 52fcaf96bc0..587d45428f0 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_zyd.c,v 1.88 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: if_zyd.c,v 1.89 2013/03/28 03:58:03 tedu Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -25,7 +25,6 @@
#include <sys/param.h>
#include <sys/sockio.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/socket.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 39aa7bfe52c..996670fbbbd 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.107 2013/03/02 22:57:30 miod Exp $ */
+/* $OpenBSD: ohci.c,v 1.108 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -45,7 +45,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 9a9bf954d20..04439cb2dd5 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.97 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: uaudio.c,v 1.98 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -46,7 +46,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index e5f67683ffe..597ad10d294 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsa.c,v 1.55 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: ubsa.c,v 1.56 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -65,7 +65,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index a29d17dc65e..3a3de03a9c8 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubt.c,v 1.21 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: ubt.c,v 1.22 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ubt.c,v 1.35 2008/07/28 14:19:26 drochner Exp $ */
/*-
@@ -73,7 +73,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index c0ffe48580f..ac156b636c6 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucom.c,v 1.56 2012/12/31 04:25:46 miod Exp $ */
+/* $OpenBSD: ucom.c,v 1.57 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/device.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 88bf615ca7d..fdb35606ef5 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udcf.c,v 1.55 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: udcf.c,v 1.56 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -22,11 +22,11 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/select.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
#include <sys/time.h>
#include <sys/sensors.h>
+#include <sys/timeout.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index f5427b1fbc8..d3f831a3de0 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udl.c,v 1.71 2012/09/18 17:24:51 jasper Exp $ */
+/* $OpenBSD: udl.c,v 1.72 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -32,7 +32,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <uvm/uvm.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 08bac37de0d..83f579d1d67 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ugen.c,v 1.68 2011/12/07 06:23:18 mglocker Exp $ */
+/* $OpenBSD: ugen.c,v 1.69 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -43,7 +43,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 825c607c1fb..83a8727e714 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.92 2012/08/17 17:29:00 krw Exp $ */
+/* $OpenBSD: uhci.c,v 1.93 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -48,7 +48,6 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/queue.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/uhts.c b/sys/dev/usb/uhts.c
index bf9e5a0cf7a..f4cf6a9786b 100644
--- a/sys/dev/usb/uhts.c
+++ b/sys/dev/usb/uhts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhts.c,v 1.5 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: uhts.c,v 1.6 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu>
* Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -53,7 +53,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 04130e7001b..9c03b5aa544 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhub.c,v 1.59 2011/09/29 11:18:01 stsp Exp $ */
+/* $OpenBSD: uhub.c,v 1.60 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
@@ -41,7 +41,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 61a62f1f3cd..446aef7c3b8 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ulpt.c,v 1.41 2013/01/28 17:15:31 stsp Exp $ */
+/* $OpenBSD: ulpt.c,v 1.42 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
@@ -39,7 +39,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/uio.h>
diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c
index 80243cb611f..1cdc726dd69 100644
--- a/sys/dev/usb/umbg.c
+++ b/sys/dev/usb/umbg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umbg.c,v 1.18 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: umbg.c,v 1.19 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -22,11 +22,11 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/select.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
#include <sys/time.h>
#include <sys/sensors.h>
+#include <sys/timeout.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 94f6a06057f..b32e24cff3e 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umct.c,v 1.34 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: umct.c,v 1.35 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 9fdec4f5ad0..01f39b6975e 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umidi.c,v 1.34 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: umidi.c,v 1.35 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index 5d82657f09e..ace9930102c 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umidi_quirks.c,v 1.11 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: umidi_quirks.c,v 1.12 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */
/*
@@ -39,7 +39,6 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 292729890f5..1d3f12de64c 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umodem.c,v 1.46 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: umodem.c,v 1.47 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
/*
@@ -52,7 +52,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/uoak_subr.c b/sys/dev/usb/uoak_subr.c
index 8af2912911f..bd4eef13d2c 100644
--- a/sys/dev/usb/uoak_subr.c
+++ b/sys/dev/usb/uoak_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoak_subr.c,v 1.2 2012/10/19 14:52:38 deraadt Exp $ */
+/* $OpenBSD: uoak_subr.c,v 1.3 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -20,7 +20,6 @@
/* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uoaklux.c b/sys/dev/usb/uoaklux.c
index af997a9bdf8..1a15b5bc3b9 100644
--- a/sys/dev/usb/uoaklux.c
+++ b/sys/dev/usb/uoaklux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoaklux.c,v 1.2 2012/10/19 14:52:38 deraadt Exp $ */
+/* $OpenBSD: uoaklux.c,v 1.3 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -20,7 +20,6 @@
/* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uoakrh.c b/sys/dev/usb/uoakrh.c
index d403381b20a..070d3203d46 100644
--- a/sys/dev/usb/uoakrh.c
+++ b/sys/dev/usb/uoakrh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoakrh.c,v 1.2 2012/10/19 14:52:38 deraadt Exp $ */
+/* $OpenBSD: uoakrh.c,v 1.3 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -20,7 +20,6 @@
/* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uoakv.c b/sys/dev/usb/uoakv.c
index 81a0452de23..567174a78d0 100644
--- a/sys/dev/usb/uoakv.c
+++ b/sys/dev/usb/uoakv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uoakv.c,v 1.2 2012/10/19 14:52:38 deraadt Exp $ */
+/* $OpenBSD: uoakv.c,v 1.3 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2012 Yojiro UO <yuo@nui.org>
@@ -20,7 +20,6 @@
/* http://developer.toradex.com/files/toradex-dev/uploads/media/Oak/Oak_ProgrammingGuide.pdf */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index c539d708833..a4434a6e19d 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uow.c,v 1.30 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: uow.c,v 1.31 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <dev/onewire/onewirereg.h>
#include <dev/onewire/onewirevar.h>
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index ae2964b04cc..8953ab90c9b 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uplcom.c,v 1.57 2013/03/28 03:31:55 tedu Exp $ */
+/* $OpenBSD: uplcom.c,v 1.58 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index ce155984ce9..b9549507f73 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: urio.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: urio.c,v 1.40 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */
/*
@@ -45,7 +45,6 @@
#include <sys/conf.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 895923efa09..2a5e45c41d6 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb.c,v 1.83 2013/03/28 03:31:56 tedu Exp $ */
+/* $OpenBSD: usb.c,v 1.84 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
/*
@@ -48,7 +48,6 @@
#include <sys/device.h>
#include <sys/timeout.h>
#include <sys/kthread.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
#include <sys/poll.h>
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 00a14d49394..d4725ae8835 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_mem.c,v 1.23 2011/04/05 19:54:35 jasper Exp $ */
+/* $OpenBSD: usb_mem.c,v 1.24 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usb_mem.c,v 1.26 2003/02/01 06:23:40 thorpej Exp $ */
/*
@@ -47,10 +47,6 @@
#include <sys/device.h> /* for usbdivar.h */
#include <machine/bus.h>
-#ifdef DIAGNOSTIC
-#include <sys/proc.h>
-#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h> /* just for usb_dma_t */
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index c017c33a9a4..8c51584dd3a 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_subr.c,v 1.83 2013/03/16 11:11:22 mpi Exp $ */
+/* $OpenBSD: usb_subr.c,v 1.84 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -38,7 +38,6 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 179a9b5e777..82d741c217d 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.c,v 1.44 2011/12/16 00:04:37 fgsch Exp $ */
+/* $OpenBSD: usbdi.c,v 1.45 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -37,7 +37,6 @@
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/rwlock.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 2954c5e89bf..9e21fd26694 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi_util.c,v 1.26 2010/12/17 23:14:00 jakemsr Exp $ */
+/* $OpenBSD: usbdi_util.c,v 1.27 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */
@@ -36,7 +36,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/device.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 8152ca59fc7..115b3dabee0 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdivar.h,v 1.45 2013/03/16 11:11:22 mpi Exp $ */
+/* $OpenBSD: usbdivar.h,v 1.46 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
@@ -32,6 +32,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/timeout.h>
+
/* From usb_mem.h */
struct usb_dma_block;
typedef struct {
diff --git a/sys/dev/usb/usbf_subr.c b/sys/dev/usb/usbf_subr.c
index 4a0b29ed476..5b8d6075e70 100644
--- a/sys/dev/usb/usbf_subr.c
+++ b/sys/dev/usb/usbf_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbf_subr.c,v 1.15 2009/11/04 19:14:10 kettenis Exp $ */
+/* $OpenBSD: usbf_subr.c,v 1.16 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/param.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index c28fdaeb943..963035de1ad 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uscanner.c,v 1.46 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: uscanner.c,v 1.47 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */
/*
@@ -41,7 +41,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/poll.h>
#include <sys/conf.h>
diff --git a/sys/dev/usb/usps.c b/sys/dev/usb/usps.c
index 036ce57b912..c9cd55d0d7a 100644
--- a/sys/dev/usb/usps.c
+++ b/sys/dev/usb/usps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usps.c,v 1.1 2011/09/16 15:48:19 yuo Exp $ */
+/* $OpenBSD: usps.c,v 1.2 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2011 Yojiro UO <yuo@nui.org>
@@ -19,7 +19,6 @@
/* Driver for usb smart power strip FX-5204PS */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index c48a92eebb8..58964efb87e 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthum.c,v 1.17 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: uthum.c,v 1.18 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@@ -19,7 +19,6 @@
/* Driver for HID base TEMPer seriese Temperature(/Humidity) sensors */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/utrh.c b/sys/dev/usb/utrh.c
index 73389ec97ee..b4d18c54ff3 100644
--- a/sys/dev/usb/utrh.c
+++ b/sys/dev/usb/utrh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utrh.c,v 1.8 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: utrh.c,v 1.9 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2009 Yojiro UO <yuo@nui.org>
@@ -19,7 +19,6 @@
/* Driver for Strawberry linux USBRH Temerature/Humidity sensor */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/utwitch.c b/sys/dev/usb/utwitch.c
index dd9720f86e7..200795676a1 100644
--- a/sys/dev/usb/utwitch.c
+++ b/sys/dev/usb/utwitch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utwitch.c,v 1.5 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: utwitch.c,v 1.6 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2010 Yojiro UO <yuo@nui.org>
@@ -20,7 +20,6 @@
/* this driver was previously known as uyurex(4). */
#include <sys/param.h>
-#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 5f71f7d867d..85d9c49307b 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.168 2013/03/28 03:31:56 tedu Exp $ */
+/* $OpenBSD: uvideo.c,v 1.169 2013/03/28 03:58:03 tedu Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -26,7 +26,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/proc.h>
#include <sys/lock.h>
#include <sys/stat.h>
#include <sys/device.h>
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 1ea24a36fbe..ebe8bd5952d 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvscom.c,v 1.25 2013/03/28 03:31:56 tedu Exp $ */
+/* $OpenBSD: uvscom.c,v 1.26 2013/03/28 03:58:03 tedu Exp $ */
/* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -45,7 +45,6 @@
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/device.h>
-#include <sys/proc.h>
#include <sys/poll.h>
#include <dev/usb/usb.h>