diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-26 23:37:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 01:25:32 +0200 |
| commit | d30f2065d6da377cc76771aca5a9850cfca8723b (patch) | |
| tree | 5420d83f6064e7eb57a587fb389dd0d7fcbdbc4f | |
| parent | USB: storage: ene_ub6250: Use kmemdup instead of kmalloc + memcpy (diff) | |
| download | linux-d30f2065d6da377cc76771aca5a9850cfca8723b.tar.xz linux-d30f2065d6da377cc76771aca5a9850cfca8723b.zip | |
usb: gadget: rename CONFIG_USB_GADGET_PXA25X
Commit 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
basically renamed the Kconfig symbol USB_GADGET_PXA25X to USB_PXA25X. It
did not rename the related macros in use at that time. Commit
c0a39151a405 ("ARM: pxa: fix inconsistent CONFIG_USB_PXA27X") did so for
all but one macro. Rename that last macro too now.
Fixes: 193ab2a60700 ("usb: gadget: allow multiple gadgets to be built")
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 5b840fb0cce5..ee6c16416c30 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -1502,7 +1502,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) |