From fbaee8e9953bca3952c7776ee640bf661a290713 Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Tue, 10 Jul 2012 17:19:25 +0100
Subject: [PATCH] --- yaml --- r: 317063 b: refs/heads/master c:
 0d5ff306582834e3172365d619ec0cfe7a4f79ba h: refs/heads/master i:   317061:
 39960ac2b9ef07d5746ef798632bcc8ccf871363   317059:
 c3fcb38c519d985cf4ae7d2a9b4f64954afc8b57   317055:
 c31ed1a30add53d3b7ad0a2a4474bbff2f75627c v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/usb.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 {