diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:14:06 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:14:06 +0000 |
| commit | e6b6edf267c6d157d22c7d409182854bf0c110a0 (patch) | |
| tree | aa292cb560ee807f0e658c5e56dc95008beb94f5 /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 0e934e22f3fabb98c41737e2e30bd9db2668e935 (diff) | |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
Diffstat (limited to 'arch/arm/mach-at91/at91sam9261_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index ae78f4d03b7..a178b58b0b9 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -87,7 +87,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[] = { |