summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorNick Hibma <n_hibma@FreeBSD.org>1999-11-08 21:06:21 +0000
committerNick Hibma <n_hibma@FreeBSD.org>1999-11-08 21:06:21 +0000
commit24b4921ad1605bc510017d196108e5455b76d59b (patch)
tree2e5b3e25bfa6c6c106c4d5e1cf9efa4bccbcdf51 /sys/dev/usb
parentee665f5a801f39330a5409ee616ed90e5668177e (diff)
Notes
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/hid.c5
-rw-r--r--sys/dev/usb/ohci.c2
-rw-r--r--sys/dev/usb/uhci.c2
-rw-r--r--sys/dev/usb/usb.c2
-rw-r--r--sys/dev/usb/usb_quirks.c3
-rw-r--r--sys/dev/usb/usbdi.c4
-rw-r--r--sys/dev/usb/usbdi_util.c2
7 files changed, 7 insertions, 13 deletions
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 1437d69a409d..c782c50a3afc 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -40,11 +40,10 @@
#include <sys/param.h>
#include <sys/systm.h>
+#if defined(__NetBSD__)
#include <sys/kernel.h>
-#include <sys/malloc.h>
-#if defined(__FreeBSD__)
-#include <sys/bus.h>
#endif
+#include <sys/malloc.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 76c1f66799e3..0c5855c7c5c2 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -51,13 +51,13 @@
#include <sys/malloc.h>
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/device.h>
+#include <sys/select.h>
#elif defined(__FreeBSD__)
#include <sys/module.h>
#include <sys/bus.h>
#endif
#include <sys/proc.h>
#include <sys/queue.h>
-#include <sys/select.h>
#if defined(__FreeBSD__)
#include <machine/bus_pio.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 48e660da1668..81a65342116e 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -54,13 +54,13 @@
#include <sys/malloc.h>
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/device.h>
+#include <sys/select.h>
#elif defined(__FreeBSD__)
#include <sys/module.h>
#include <sys/bus.h>
#endif
#include <sys/proc.h>
#include <sys/queue.h>
-#include <sys/select.h>
#if defined(__FreeBSD__)
#include <machine/bus_pio.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 971eab0471aa..f774835af35f 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -51,6 +51,7 @@
#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <sys/device.h>
#include <sys/kthread.h>
+#include <sys/proc.h>
#elif defined(__FreeBSD__)
#include <sys/module.h>
#include <sys/bus.h>
@@ -59,7 +60,6 @@
#include <sys/conf.h>
#endif
#include <sys/poll.h>
-#include <sys/proc.h>
#include <sys/select.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 567f31d1b2c1..685d700b453a 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -40,9 +40,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#if defined(__FreeBSD__)
-#include <sys/bus.h>
-#endif
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index f07d00f2c1ee..72207f990746 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -40,18 +40,16 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/kernel.h>
#include <sys/device.h>
#elif defined(__FreeBSD__)
#include <sys/module.h>
#include <sys/bus.h>
-#include <sys/conf.h>
#endif
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index cc64284928bb..69fa222bd905 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -42,8 +42,8 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/proc.h>
#include <sys/device.h>
#elif defined(__FreeBSD__)
#include <sys/bus.h>