projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
usb
/
gadget
/
inode.c
diff --git
a/drivers/usb/gadget/inode.c
b/drivers/usb/gadget/inode.c
index
69b0a27
..
f132a92
100644
(file)
--- a/
drivers/usb/gadget/inode.c
+++ b/
drivers/usb/gadget/inode.c
@@
-1501,7
+1501,7
@@
gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
}
break;
-#ifndef CONFIG_USB_GADGET_PXA2
X
X
+#ifndef CONFIG_USB_GADGET_PXA2
5
X
/* PXA automagically handles this request too */
case USB_REQ_GET_CONFIGURATION:
if (ctrl->bRequestType != 0x80)