Merge from NetBSD:

    usb.c:	-r1.35 - 1.37
    usb_port.h:	tiny bit of -r1.26 + an extra bit in the FreeBSD config section.

	revision 1.37
	date: 2000/01/24 18:35:51;  author: thorpej;  state: Exp;  lines: +7 -1
	Use config_pending.
	----------------------------
	revision 1.36
	date: 1999/12/22 23:54:09;  author: augustss;  state: Exp;  lines: +2 -2
	Use the flags `locator' to govern if devices are detected early or
	late during cold boot.
	----------------------------
	revision 1.35
	date: 1999/12/20 02:12:23;  author: augustss;  state: Exp;  lines: +8 -5
	Make sure tsleep() is not called during cold boot.

1 files changed, 6 insertions, 0 deletions

diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 21cb9868c465..3f7842250bc9 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -177,6 +177,9 @@ typedef struct proc *usb_proc_ptr;
 #define kthread_create1		kthread_create
 #define kthread_create		kthread_create_deferred
 
+#define	config_pending_incr()
+#define	config_pending_decr()
+
 #define	usbpoll			usbselect
 #define	uhidpoll		uhidselect
 #define	ugenpoll		ugenselect
@@ -303,6 +306,9 @@ typedef struct thread *usb_proc_ptr;
 #define kthread_create1(f, s, p, a0, a1) \
 		kthread_create((f), (s), (p), RFHIGHPID, (a0), (a1))
 
+#define	config_pending_incr()
+#define	config_pending_decr()
+
 #define usb_timeout(f, d, t, h) ((h) = timeout((f), (d), (t)))
 #define usb_untimeout(f, d, h) untimeout((f), (d), (h))