1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index e87826e23d59..e656e7b4b1e4 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -426,7 +426,6 @@ struct usb_bus {
         struct device *sysdev;          /* as seen from firmware or bus */
         int busnum;                     /* Bus number (in order of reg) */
         const char *bus_name;           /* stable id (PCI slot_name etc) */
-        u8 uses_dma;                    /* Does the host controller use DMA? */
         u8 uses_pio_for_control;        /*
                                          * Does the host controller use PIO
                                          * for control transfers?
@@ -1151,6 +1150,8 @@ struct usbdrv_wrap {
  * @id_table: USB drivers use ID table to support hotplugging.
  *      Export this with MODULE_DEVICE_TABLE(usb,...).  This must be set
  *      or your driver's probe function will never get called.
+ * @dev_groups: Attributes attached to the device that will be created once it
+ *      is bound to the driver.
  * @dynids: used internally to hold the list of dynamically added device
  *      ids for this driver.
  * @drvwrap: Driver-model core structure wrapper.
@@ -1198,6 +1199,7 @@ struct usb_driver {
         int (*post_reset)(struct usb_interface *intf);
 
         const struct usb_device_id *id_table;
+        const struct attribute_group **dev_groups;
 
         struct usb_dynids dynids;
         struct usbdrv_wrap drvwrap;
@@ -1221,6 +1223,8 @@ struct usb_driver {
  *      module is being unloaded.
  * @suspend: Called when the device is going to be suspended by the system.
  * @resume: Called when the device is being resumed by the system.
+ * @dev_groups: Attributes attached to the device that will be created once it
+ *      is bound to the driver.
  * @drvwrap: Driver-model core structure wrapper.
  * @supports_autosuspend: if set to 0, the USB core will not allow autosuspend
  *      for devices bound to this driver.
@@ -1235,6 +1239,7 @@ struct usb_device_driver {
 
         int (*suspend) (struct usb_device *udev, pm_message_t message);
         int (*resume) (struct usb_device *udev, pm_message_t message);
+        const struct attribute_group **dev_groups;
         struct usbdrv_wrap drvwrap;
         unsigned int supports_autosuspend:1;
 };