diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 23:25:44 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 23:25:44 +0000 |
| commit | a5368e770c9ec58b9d18378844c149df8513e7b8 (patch) | |
| tree | 2dc0953afd7f54f3269486fc0edbb41cd9cf804e /arch/arm/mach-at91/at91sam9261_devices.c | |
| parent | 88fa269bedc3ae0f67426ea7fe9d306103b7fb1c (diff) | |
| parent | cf844751fb25e095d8fa30332cb173a73e5a736c (diff) | |
| download | linux-a5368e770c9ec58b9d18378844c149df8513e7b8.tar.gz | |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
* 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: drop ide driver in favor of the pata one
pata/at91: use newly introduced SMC accessors
ARM: at91: add accessor to manage SMC
ARM: at91:rtc/rtc-at91sam9: ioremap register bank
ARM: at91: USB AT91 gadget registration for module
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 fc59cbdb0e3c..1e28bed8f425 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_AT91 +#if defined(CONFIG_USB_AT91) || defined(CONFIG_USB_AT91_MODULE) static struct at91_udc_data udc_data; static struct resource udc_resources[] = { |