diff --git a/[refs] b/[refs] index c00a76a3eb7b..29aaeab2d7f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57bfc0a7ae21ee3c5a7f38b0577450b29a3333ac +refs/heads/master: 28dd924a7b023d49401f9fcbd9efcdaa161370c6 diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c index dd24f966af10..5cacccbc39b5 100644 --- a/trunk/drivers/usb/musb/musb_core.c +++ b/trunk/drivers/usb/musb/musb_core.c @@ -1849,9 +1849,9 @@ static void musb_free(struct musb *musb) /* * Perform generic per-controller initialization. * - * @pDevice: the controller (already clocked, etc) - * @nIrq: irq - * @mregs: virtual address of controller registers, + * @dev: the controller (already clocked, etc) + * @nIrq: IRQ number + * @ctrl: virtual address of controller registers, * not yet corrected for platform-specific offsets */ static int __devinit