diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-26 23:37:09 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-02 12:06:06 +0200 |
| commit | 4f63298bf686f8357176aedd2a8fd913b81ebe70 (patch) | |
| tree | f0536c2864b1259a486a9abe976cd35155453ecd | |
| parent | c0c1bcdd4ae9d9ca0adfdeeee719f6cacb8320fc (diff) | |
| download | linux-stable-4f63298bf686f8357176aedd2a8fd913b81ebe70.tar.gz linux-stable-4f63298bf686f8357176aedd2a8fd913b81ebe70.tar.bz2 linux-stable-4f63298bf686f8357176aedd2a8fd913b81ebe70.zip | |
usb: gadget: rename CONFIG_USB_GADGET_PXA25X
commit d30f2065d6da377cc76771aca5a9850cfca8723b upstream.
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: Jiri Slaby <jslaby@suse.cz>
| -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) |