Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30f2065 authored by Paul Bolle's avatar Paul Bolle Committed by Greg Kroah-Hartman
Browse files

usb: gadget: rename CONFIG_USB_GADGET_PXA25X 



Commit 193ab2a6 ("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
c0a39151 ("ARM: pxa: fix inconsistent CONFIG_USB_PXA27X") did so for
all but one macro. Rename that last macro too now.

Fixes: 193ab2a6 ("usb: gadget: allow multiple gadgets to be built")
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a328512d

drivers/usb/gadget/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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)