diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-09-18 23:24:13 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-09-18 23:24:13 +0000 |
commit | 7fbcb0d21f1e3057dc3a3c665ca09626fbed9de4 (patch) | |
tree | 080a1cdbccd097d40568d86dbba136254d947705 /sys/dev | |
parent | 4d4a5518059e8cde68b6050db93887a2e511b0eb (diff) |
usbdivar.h needs struct timeout. But don't get it indirectly via
sys/kthread.h, use sys/timeout.h explicitly. Noted by Michael
Knudsen.
ok deraadt@ kettenis@ guenther@
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/usb/if_atu.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/if_wi_usb.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/ueagle.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/usb.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/usbf.c | 4 | ||||
-rw-r--r-- | sys/dev/usb/uvideo.c | 3 |
6 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 3b999b953b6..5f1659bae15 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.99 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: if_atu.c,v 1.100 2011/09/18 23:24:12 krw Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -53,7 +53,7 @@ #include <sys/kernel.h> #include <sys/socket.h> #include <sys/systm.h> -#include <sys/kthread.h> +#include <sys/timeout.h> #include <sys/queue.h> #include <sys/device.h> diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index bd62c1431f9..7c8071980ae 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.53 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.54 2011/09/18 23:24:12 krw Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -38,6 +38,7 @@ #include <sys/proc.h> #include <sys/socket.h> #include <sys/device.h> +#include <sys/timeout.h> #include <sys/kthread.h> #include <sys/tree.h> diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c index 73c33ba5139..71bf18e229d 100644 --- a/sys/dev/usb/ueagle.c +++ b/sys/dev/usb/ueagle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ueagle.c,v 1.34 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: ueagle.c,v 1.35 2011/09/18 23:24:12 krw Exp $ */ /*- * Copyright (c) 2003-2006 @@ -31,7 +31,7 @@ #include <sys/socket.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kthread.h> +#include <sys/timeout.h> #include <net/bpf.h> #include <net/if.h> diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index ce40062aad5..490a331d2f2 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.77 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: usb.c,v 1.78 2011/09/18 23:24:12 krw Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -46,6 +46,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> +#include <sys/timeout.h> #include <sys/kthread.h> #include <sys/proc.h> #include <sys/conf.h> diff --git a/sys/dev/usb/usbf.c b/sys/dev/usb/usbf.c index cac626e19e2..8f5eb635e4e 100644 --- a/sys/dev/usb/usbf.c +++ b/sys/dev/usb/usbf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbf.c,v 1.12 2010/10/28 16:07:53 deraadt Exp $ */ +/* $OpenBSD: usbf.c,v 1.13 2011/09/18 23:24:12 krw Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -52,7 +52,7 @@ #include <sys/param.h> #include <sys/device.h> -#include <sys/kthread.h> +#include <sys/timeout.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index ceec0096e72..0e3dd60d3c7 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.164 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: uvideo.c,v 1.165 2011/09/18 23:24:12 krw Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -34,6 +34,7 @@ #include <sys/stat.h> #include <sys/device.h> #include <sys/poll.h> +#include <sys/timeout.h> #include <sys/kthread.h> #include <uvm/uvm.h> |