From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
alan@lxorguk.ukuu.org.uk, Jochen Friedrich <jochen@scram.de>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Subject: [04/26] ARM: at91: Fix USBA gadget registration
Date: Fri, 18 Nov 2011 16:02:40 -0800 [thread overview]
Message-ID: <20111119000328.214865274@clark.kroah.org> (raw)
In-Reply-To: <20111119000336.GA8452@kroah.com>
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] = {
next prev parent reply other threads:[~2011-11-19 0:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-19 0:03 [00/26] 3.1.2-stable review Greg KH
2011-11-19 0:02 ` [01/26] ALSA: hda - fix internal mic on Dell Vostro 3500 laptop Greg KH
2011-11-19 0:02 ` [02/26] ALSA: hda - Dont add elements of other codecs to vmaster slave Greg KH
2011-11-19 0:02 ` [03/26] virtio-pci: fix use after free Greg KH
2011-11-19 0:02 ` Greg KH [this message]
2011-11-19 0:02 ` [05/26] ASoC: Dont use wm8994->control_data in wm8994_readable_register() Greg KH
2011-11-19 0:02 ` [06/26] sh: Fix cached/uncaced address calculation in 29bit mode Greg KH
2011-11-19 0:02 ` [07/26] drm/i915: Fix object refcount leak on mmappable size limit error path Greg KH
2011-11-19 0:02 ` [08/26] drm/nouveau: initialize chan->fence.lock before use Greg KH
2011-11-19 0:02 ` [09/26] drm/radeon/kms: make an aux failure debug only Greg KH
2011-11-19 0:02 ` [10/26] ALSA: usb-audio - Check the dB-range validity in the later read, too Greg KH
2011-11-19 0:02 ` [11/26] ALSA: usb-audio - Fix the missing volume quirks at delayed init Greg KH
2011-11-19 0:02 ` [12/26] KEYS: Fix a NULL pointer deref in the user-defined key type Greg KH
2011-11-19 0:02 ` [13/26] hfs: add sanity check for file name length Greg KH
2011-11-19 0:02 ` [14/26] Revert "leds: save the delay values after a successful call to blink_set()" Greg KH
2011-11-19 0:02 ` [15/26] drm/radeon: add some missing FireMV pci ids Greg KH
2011-11-19 0:02 ` [16/26] staging: brcm80211: fill in proper rx rate in mac80211 rx status Greg KH
2011-11-19 0:02 ` [17/26] b43: refuse to load unsupported firmware Greg KH
2011-11-19 17:22 ` Ben Hutchings
2011-11-19 19:05 ` Greg KH
2011-11-19 19:49 ` Ben Hutchings
2011-11-19 0:02 ` [18/26] mfd: Fix twl4030 dependencies for audio codec Greg KH
2011-11-19 0:02 ` [19/26] xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs Greg KH
2011-11-19 0:02 ` [20/26] xen-gntalloc: integer overflow in gntalloc_ioctl_alloc() Greg KH
2011-11-19 0:02 ` [21/26] xen-gntalloc: signedness bug in add_grefs() Greg KH
2011-11-19 0:02 ` [22/26] powerpc/ps3: Fix lost SMP IPIs Greg KH
2011-11-19 0:02 ` [23/26] powerpc: Add hvcall.h include to book3s_hv.c Greg KH
2011-11-19 0:03 ` [24/26] powerpc: Copy down exception vectors after feature fixups Greg KH
2011-11-19 0:03 ` [25/26] backing-dev: ensure wakeup_timer is deleted Greg KH
2011-11-19 0:03 ` [26/26] block: Always check length of all iov entries in blk_rq_map_user_iov() Greg KH
2011-11-19 19:57 ` [00/26] 3.1.2-stable review Woody Suwalski
2011-11-20 0:43 ` Greg KH
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=20111119000328.214865274@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jochen@scram.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®