Pull bugzilla-7897 into release branch

[linux-2.6] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 1c56386de70981960a09ef4ff389ab47eda2de7d..b5c226a87ed87640252139a6dda2f701aa4636bc 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -893,10 +893,11 @@ struct usb_class_driver {
  * use these in module_init()/module_exit()
  * and don't forget MODULE_DEVICE_TABLE(usb, ...)
  */
-extern int usb_register_driver(struct usb_driver *, struct module *);
+extern int usb_register_driver(struct usb_driver *, struct module *,
+                              const char *);
 static inline int usb_register(struct usb_driver *driver)
 {
-       return usb_register_driver(driver, THIS_MODULE);
+       return usb_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);
 }
 extern void usb_deregister(struct usb_driver *);
 
@@ -1110,7 +1111,6 @@ struct urb
        struct kref kref;               /* reference count of the URB */
        spinlock_t lock;                /* lock for the URB */
        void *hcpriv;                   /* private data for host controller */
-       int bandwidth;                  /* bandwidth for INT/ISO request */
        atomic_t use_count;             /* concurrent submissions counter */
        u8 reject;                      /* submissions will fail */