USB: fsl_qe_udc: Fix oops on QE UDC probe failure

[safe/jmp/linux-2.6] / drivers / usb / gadget / atmel_usba_udc.c

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 07e5a0b..65b03e3 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 #include "atmel_usba_udc.h"
 
@@ -334,7 +334,7 @@ static void toggle_bias(int is_on)
 
 #elif defined(CONFIG_ARCH_AT91)
 
-#include <asm/arch/at91_pmc.h>
+#include <mach/at91_pmc.h>
 
 static void toggle_bias(int is_on)
 {
@@ -1034,7 +1034,7 @@ static struct usba_udc the_udc = {
                .is_dualspeed   = 1,
                .name           = "atmel_usba_udc",
                .dev    = {
-                       .bus_id         = "gadget",
+                       .init_name      = "gadget",
                        .release        = nop_release,
                },
        },