This is a note to let you know that I've just added the patch titled
usb: gadget: rename CONFIG_USB_GADGET_PXA25X
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-gadget-rename-config_usb_gadget_pxa25x.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d30f2065d6da377cc76771aca5a9850cfca8723b Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@xxxxxxxxxx>
Date: Mon, 26 May 2014 23:37:09 +0200
Subject: usb: gadget: rename CONFIG_USB_GADGET_PXA25X
From: Paul Bolle <pebolle@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/gadget/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1504,7 +1504,7 @@ gadgetfs_setup (struct usb_gadget *gadge
}
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)
Patches currently in stable-queue which might be from pebolle@xxxxxxxxxx are
queue-3.14/usb-gadget-rename-config_usb_gadget_pxa25x.patch
queue-3.14/arm-omap-replace-checks-for-config_usb_gadget_omap.patch
queue-3.14/staging-tidspbridge-check-for-config_snd_omap_soc_mcbsp.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html