This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 4035ff9..f1dff4f 100644 (file)
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -22,29 +22,8 @@ extern int usb_get_device_descriptor(struct usb_device *dev,
                unsigned int size);
 extern int usb_set_configuration(struct usb_device *dev, int configuration);
 
-extern void usb_lock_all_devices(void);
-extern void usb_unlock_all_devices(void);
+extern void usb_set_device_state(struct usb_device *udev,
+               enum usb_device_state new_state);
 
 /* for labeling diagnostics */
 extern const char *usbcore_name;
-
-/* usbfs stuff */
-extern struct usb_driver usbfs_driver;
-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;
-       struct file *file;
-       spinlock_t lock;            /* protects the async urb lists */
-       struct list_head async_pending;
-       struct list_head async_completed;
-       wait_queue_head_t wait;     /* wake up if a request completed */
-       unsigned int discsignr;
-       struct task_struct *disctask;
-       void __user *disccontext;
-       unsigned long ifclaimed;
-};
-