linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicolas Ferre <nicolas.ferre@atmel.com>
To: Jochen Friedrich <jochen@scram.de>
Cc: linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, balbi@ti.com
Subject: Re: [PATCH] ARM: at91: Fix USBA gadget registration
Date: Tue, 25 Oct 2011 23:08:45 +0200	[thread overview]
Message-ID: <4EA7255D.6020102@atmel.com> (raw)
In-Reply-To: <1319568666-10745-1-git-send-email-jochen@scram.de>

On 10/25/2011 08:51 PM, Jochen Friedrich :
> Since 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don't
> register USBA adapters anymore due to depending on a now non-existing
> symbol. Fix the symbol name.

Friedrich,

Thanks a lot for this patch... and moreover I have just retrieved it in
my backlog: sorry for not having taken care of it earlier.

But actually, it is too bad that this patch has broken those tree boards.

> Signed-off-by: Jochen Friedrich <jochen@scram.de>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

I queue it in my at91-fixes branch and send it to Arnd soon.

Best regards,

> CC: stable@kernel.org

^^^^
Yes, for sure!

> ---
>  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(-)
> 
> diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
> index dba0d8d..0512baf 100644
> --- 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 at91_usbh_data *data) {}
>   *  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] = {
> diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
> index 600bffb..371bb0e 100644
> --- 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(struct at91_usbh_data *data) {}
>   *  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,
> diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
> index aacb19d..c884d59 100644
> --- 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] = {


-- 
Nicolas Ferre

      reply	other threads:[~2011-10-25 21:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25 18:51 [PATCH] ARM: at91: Fix USBA gadget registration Jochen Friedrich
2011-10-25 21:08 ` Nicolas Ferre [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4EA7255D.6020102@atmel.com \
    --to=nicolas.ferre@atmel.com \
    --cc=balbi@ti.com \
    --cc=jochen@scram.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).