lkml.org 
[lkml]   [2011]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[04/26] ARM: at91: Fix USBA gadget registration
    3.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jochen Friedrich <jochen@scram.de>

    commit dd0b3825495a2e7a8cd6cf0ec077618c008ac7c4 upstream.

    Since 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don't
    register USBA adapters anymore due to depending on a now non-existing
    symbol. Fix the symbol name.

    Signed-off-by: Jochen Friedrich <jochen@scram.de>
    Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/mach-at91/at91cap9_devices.c | 2 +-
    arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
    arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/arm/mach-at91/at91cap9_devices.c
    +++ b/arch/arm/mach-at91/at91cap9_devices.c
    @@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct
    * USB HS Device (Gadget)
    * -------------------------------------------------------------------- */

    -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
    +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)

    static struct resource usba_udc_resources[] = {
    [0] = {
    --- a/arch/arm/mach-at91/at91sam9g45_devices.c
    +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
    @@ -191,7 +191,7 @@ void __init at91_add_device_usbh_ehci(st
    * USB HS Device (Gadget)
    * -------------------------------------------------------------------- */

    -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
    +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)
    static struct resource usba_udc_resources[] = {
    [0] = {
    .start = AT91SAM9G45_UDPHS_FIFO,
    --- a/arch/arm/mach-at91/at91sam9rl_devices.c
    +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
    @@ -75,7 +75,7 @@ void __init at91_add_device_hdmac(void)
    * USB HS Device (Gadget)
    * -------------------------------------------------------------------- */

    -#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
    +#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)

    static struct resource usba_udc_resources[] = {
    [0] = {



    \
     
     \ /
      Last update: 2011-11-19 01:15    [W:0.022 / U:180.828 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site