summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91sam9263_devices.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-16 07:02:34 +0100
committerOlof Johansson <olof@lixom.net>2011-12-16 07:02:34 +0100
commit02735a29d8ce882ec698803f064e17888874780c (patch)
tree6a4afa3bc8b6d4334df24910a56f77adf126b0c7 /arch/arm/mach-at91/at91sam9263_devices.c
parentMerge branches 'at91/gpio', 'at91/ioremap', 'drivers/macb-gem-cleanup' and 'm... (diff)
parentMerge branch 'for-arnd-3.3-defconfig' of git://github.com/at91linux/linux-at9... (diff)
downloadlinux-02735a29d8ce882ec698803f064e17888874780c.tar.xz
linux-02735a29d8ce882ec698803f064e17888874780c.zip
Merge branch 'at91/defconfig' into next/cleanup
Diffstat (limited to 'arch/arm/mach-at91/at91sam9263_devices.c')
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index a1d452b22514..7b46b2787022 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -92,7 +92,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {}
* USB Device (Gadget)
* -------------------------------------------------------------------- */
-#ifdef CONFIG_USB_GADGET_AT91
+#ifdef CONFIG_USB_AT91
static struct at91_udc_data udc_data;
static struct resource udc_resources[] = {