lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 09/77] usb: gadget: rename CONFIG_USB_GADGET_PXA25X
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Bolle <pebolle@tiscali.nl>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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
    @@ -1509,7 +1509,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)



    \
     
     \ /
      Last update: 2014-06-28 22:21    [W:2.778 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site