Automatic merge of /spare/repo/linux-2.6/.git branch HEAD

[linux-2.6] / drivers / usb / core / usb.h

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 4c33eee520011bc7eba449f9c379d4e4007f067c..2c690f6d4c18b84dd83832f7aca4746dbd36d731 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -21,6 +21,13 @@ extern void usb_unlock_all_devices(void);
 extern void usb_kick_khubd(struct usb_device *dev);
 extern void usb_resume_root_hub(struct usb_device *dev);
 
+extern int  usb_hub_init(void);
+extern void usb_hub_cleanup(void);
+extern int usb_major_init(void);
+extern void usb_major_cleanup(void);
+extern int usb_host_init(void);
+extern void usb_host_cleanup(void);
+
 /* for labeling diagnostics */
 extern const char *usbcore_name;
 
@@ -30,6 +37,7 @@ extern struct file_operations usbfs_devices_fops;
 extern struct file_operations usbfs_device_file_operations;
 extern void usbfs_conn_disc_event(void);
 
+
 struct dev_state {
        struct list_head list;      /* state list */
        struct usb_device *dev;