diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
| commit | bab66e96641aeadf263ec443dbcc57090a664dea (patch) | |
| tree | 5aacb65407cf1ed65b28267b8a08a1d0b5408a91 /drivers/usb/gadget | |
| parent | 6056dff4c5196b7c7a24ba6079155e400074cdf3 (diff) | |
| parent | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index b94c049ab0d0..4ac9e9928d67 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -1504,7 +1504,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) } break; -#ifndef CONFIG_USB_GADGET_PXA25X +#ifndef CONFIG_USB_PXA25X /* PXA automagically handles this request too */ case USB_REQ_GET_CONFIGURATION: if (ctrl->bRequestType != 0x80) |