Merge branch 'topic/jack' into topic/docbook-fix

[linux-2.6-omap-h63xx.git] / 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 ae30ab1d264f46c6b45aafeca88f1491781b3c42..65b03e3445a1784535098d942bb120034d7363d4 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -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,
                },
        },