summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2007-06-18 22:30:53 +0000
committerimp <imp@FreeBSD.org>2007-06-18 22:30:53 +0000
commitfcbef6660afb146fed2f576b85a68113f6ac9128 (patch)
tree5f6b7b6cff8dc6b67a2f17a20e11ae703f3ba66a
parent88152b94fe156670ecc62ed85cb2fc061382ab8f (diff)
downloadFreeBSD-src-fcbef6660afb146fed2f576b85a68113f6ac9128.zip
FreeBSD-src-fcbef6660afb146fed2f576b85a68113f6ac9128.tar.gz
Remove usb_port.h from usb.h, except for one or two useful things that
don't belong there (these moved into usb.h).
-rw-r--r--sys/dev/usb/usb.h6
-rw-r--r--sys/dev/usb/usb_port.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index e109be2..42e9e3d 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 42a7234..460cf57 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 */
OpenPOWER on IntegriCloud