From bf7d99970409b7fa1f20af9ded1df6b7bd335fc4 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 17 Apr 2012 09:30:22 +0300
Subject: [PATCH] --- yaml --- r: 303812 b: refs/heads/master c:
 20c5e74c7b47cefaf2cd0f84bdb4830b66452384 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/composite.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4c0d8ca6f67..9a8a72c2a3ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec9c8a299a4a45ab3e08ba594eec82c425d0918
+refs/heads/master: 20c5e74c7b47cefaf2cd0f84bdb4830b66452384
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
index 4cb1801539a6..a3b19fe37f53 100644
--- a/trunk/drivers/usb/gadget/composite.c
+++ b/trunk/drivers/usb/gadget/composite.c
@@ -798,7 +798,7 @@ int usb_add_config(struct usb_composite_dev *cdev,
 static void collect_langs(struct usb_gadget_strings **sp, __le16 *buf)
 {
 	const struct usb_gadget_strings	*s;
-	u16				language;
+	__le16				language;
 	__le16				*tmp;
 
 	while (*sp) {