diff --git a/[refs] b/[refs] index f58536a874b1..28ca7228c0e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09110529780890804b22e997ae6b4fe3f0b3b158 +refs/heads/master: 0d5ff306582834e3172365d619ec0cfe7a4f79ba diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h index f8506ed0f97b..873956bec25e 100644 --- a/trunk/include/linux/usb.h +++ b/trunk/include/linux/usb.h @@ -77,14 +77,15 @@ struct usb_host_endpoint { struct usb_host_interface { struct usb_interface_descriptor desc; + int extralen; + unsigned char *extra; /* Extra descriptors */ + /* array of desc.bNumEndpoint endpoints associated with this * interface setting. these will be in no particular order. */ struct usb_host_endpoint *endpoint; char *string; /* iInterface string, if present */ - unsigned char *extra; /* Extra descriptors */ - int extralen; }; enum usb_interface_condition {