From 81d37f5acb8dbeb4c69b8539353acc64e604fb9f Mon Sep 17 00:00:00 2001
From: Marc Balmer <mbalmer@cvs.openbsd.org>
Date: Thu, 14 Jun 2007 06:55:11 +0000
Subject: Move the inclusion of sys/timeout.h from usb_port.h to the drivers
 that need it.

If a USB driver uses timeout(9) functions, the header file sys/timeout.h
must be included.

Tested by me (i386, macppc, sparc64), ckuethe (amd64), & todd (sparc, zaurus).

ok dlg.
---
 sys/arch/arm/xscale/pxa27x_udc.c | 3 ++-
 sys/dev/usb/ehci.c               | 3 ++-
 sys/dev/usb/if_cdcef.c           | 3 ++-
 sys/dev/usb/if_cue.c             | 4 ++--
 sys/dev/usb/umass.c              | 3 ++-
 sys/dev/usb/usb_port.h           | 4 +---
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c
index 07e86ae35e3..f29154bb07a 100644
--- a/sys/arch/arm/xscale/pxa27x_udc.c
+++ b/sys/arch/arm/xscale/pxa27x_udc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa27x_udc.c,v 1.21 2007/06/10 14:49:01 mbalmer Exp $ */
+/*	$OpenBSD: pxa27x_udc.c,v 1.22 2007/06/14 06:55:10 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -23,6 +23,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/timeout.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 4d4936a6d08..1a989d0dfc1 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci.c,v 1.74 2007/06/12 16:26:36 mbalmer Exp $ */
+/*	$OpenBSD: ehci.c,v 1.75 2007/06/14 06:55:09 mbalmer Exp $ */
 /*	$NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $	*/
 
 /*
@@ -68,6 +68,7 @@
 #include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
+#include <sys/timeout.h>
 
 #include <machine/bus.h>
 #include <machine/endian.h>
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c
index 6208822e270..caca58d6a43 100644
--- a/sys/dev/usb/if_cdcef.c
+++ b/sys/dev/usb/if_cdcef.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdcef.c,v 1.16 2007/06/13 11:15:29 mbalmer Exp $	*/
+/*	$OpenBSD: if_cdcef.c,v 1.17 2007/06/14 06:55:10 mbalmer Exp $	*/
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -29,6 +29,7 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
+#include <sys/timeout.h>
 
 #include <net/if.h>
 
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index ef723afd152..f34b5ac4c0f 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.43 2007/06/13 11:15:29 mbalmer Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.44 2007/06/14 06:55:10 mbalmer Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -65,7 +65,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-
+#include <sys/timeout.h>
 #include <sys/device.h>
 
 #include <net/if.h>
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index da2c83f13e0..c0ba552e5c6 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass.c,v 1.50 2007/06/13 10:33:52 mbalmer Exp $ */
+/*	$OpenBSD: umass.c,v 1.51 2007/06/14 06:55:10 mbalmer Exp $ */
 /*	$NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $	*/
 
 /*
@@ -140,6 +140,7 @@
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
+#include <sys/timeout.h>
 #undef KASSERT
 #define KASSERT(cond, msg)
 #include <machine/bus.h>
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 98a7cdadc21..8b574a7af3c 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_port.h,v 1.90 2007/06/13 11:31:33 mbalmer Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.91 2007/06/14 06:55:10 mbalmer Exp $ */
 /*	$NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -46,8 +46,6 @@
  * Macro's to cope with the differences between operating systems.
  */
 
-#include <sys/timeout.h>
-
 #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
 #define USB_USE_SOFTINTR
 #else
-- 
cgit v1.2.3