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) {