Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / imx_udc.c

diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 8d3c6a960988e06082adc3c81d74225455ed3cd5..168658b4b4e26d2bc7b2614cf5b8cb891a3614e5 100644 (file)
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1232,8 +1232,8 @@ static struct imx_udc_struct controller = {
                .ep0            = &controller.imx_ep[0].ep,
                .name           = driver_name,
                .dev = {
-                        .bus_id        = "gadget",
-                },
+                       .init_name      = "gadget",
+               },
        },
 
        .imx_ep[0] = {