Move over function prototypes from ubsdi.h to usb.c which just get used

there.  Some spacing while here.

Suggested and ok mpi@

2 files changed, 17 insertions, 17 deletions

diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index ca67a997c2f..e882ae4110f 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.87 2013/04/17 11:53:10 mglocker Exp $	*/
+/*	$OpenBSD: usb.c,v 1.88 2013/04/18 08:44:39 mglocker Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -103,20 +103,23 @@ TAILQ_HEAD(, usb_task) usb_generic_tasks;
 
 int usb_run_tasks, usb_run_abort_tasks;
 int explore_pending;
-
-void	usb_explore(void *);
-void	usb_create_task_threads(void *);
-void	usb_task_thread(void *);
-struct proc *usb_task_thread_proc = NULL;
-void	usb_abort_task_thread(void *);
-struct proc *usb_abort_task_thread_proc = NULL;
-
 const char *usbrev_str[] = USBREV_STR;
 
-int usb_match(struct device *, void *, void *); 
-void usb_attach(struct device *, struct device *, void *); 
-int usb_detach(struct device *, int); 
-int usb_activate(struct device *, int); 
+void		 usb_explore(void *);
+void		 usb_create_task_threads(void *);
+void		 usb_task_thread(void *);
+struct proc	*usb_task_thread_proc = NULL;
+void		 usb_abort_task_thread(void *);
+struct proc	*usb_abort_task_thread_proc = NULL;
+
+void		 usbd_fill_di_task(void *);
+void		 usbd_fill_udc_task(void *);
+void		 usbd_fill_udf_task(void *);
+
+int		 usb_match(struct device *, void *, void *); 
+void		 usb_attach(struct device *, struct device *, void *); 
+int		 usb_detach(struct device *, int); 
+int		 usb_activate(struct device *, int); 
 
 struct cfdriver usb_cd = { 
 	NULL, "usb", DV_DULL 
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 414c0e00d4c..be2804e2907 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdi.h,v 1.48 2013/04/15 09:23:02 mglocker Exp $ */
+/*	$OpenBSD: usbdi.h,v 1.49 2013/04/18 08:44:39 mglocker Exp $ */
 /*	$NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $	*/
 
@@ -133,9 +133,6 @@ usbd_status usbd_set_interface(struct usbd_interface *, int);
 int usbd_get_no_alts(usb_config_descriptor_t *, int);
 usbd_status  usbd_get_interface(struct usbd_interface *iface, u_int8_t *aiface);
 void usbd_fill_deviceinfo(struct usbd_device *, struct usb_device_info *, int);
-void usbd_fill_di_task(void *);
-void usbd_fill_udc_task(void *);
-void usbd_fill_udf_task(void *);
 usb_config_descriptor_t *usbd_get_cdesc(struct usbd_device *, int, int *);
 int usbd_get_interface_altindex(struct usbd_interface *iface);