From 34f7cf9af5f3ffa8235e87b98b515df52b74f1a3 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 18 Jun 2007 22:30:53 +0000
Subject: [PATCH] Remove usb_port.h from usb.h, except for one or two useful
 things that don't belong there (these moved into usb.h).

---
 sys/dev/usb/usb.h      | 6 ++++--
 sys/dev/usb/usb_port.h | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index e109be29aa1..42e9e3d0c37 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -45,11 +45,13 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <dev/usb/usb_port.h>
-
 #if defined(_KERNEL)
 #include "opt_usb.h"
 
+#ifdef SYSCTL_DECL
+SYSCTL_DECL(_hw_usb);
+#endif
+
 #include <sys/malloc.h>
 
 MALLOC_DECLARE(M_USB);
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 42a72340b7d..460cf57b3a0 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -132,8 +132,4 @@ __CONCAT(dname,_detach)(device_t self)
 */
 #define logprintf		printf
 
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_hw_usb);
-#endif
-
 #endif /* _USB_PORT_H */