Merge branch 'at91/defconfig' into next/cleanup

This commit is contained in:
Olof Johansson
2011-12-15 22:02:34 -08:00
603 changed files with 6716 additions and 4642 deletions

View File

@@ -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[] = {