On Mon, Dec 12, 2011 at 12:55:11PM +0200, Felipe Balbi wrote:
> Hi Greg,
>
> Here are the pending dwc3 patches for 3.3 merge window. All of these
> have been tested on our FPGA platform with x86 and ARM.
>
> You will have one very simple merge conflict with your greg/usb-next
> branch, here's the resolution:
>
> diff --cc drivers/usb/dwc3/dwc3-omap.c
> index 4e27d5b,5809bf4..e1a8c72
> --- a/drivers/usb/dwc3/dwc3-omap.c
> +++ b/drivers/usb/dwc3/dwc3-omap.c
> @@@ -384,8 -394,9 +394,10 @@@ static struct platform_driver dwc3_omap
> },
> };
>
> - module_platform_driver(dwc3_omap_driver);
> + MODULE_ALIAS("platform:omap-dwc3");
> +
> MODULE_AUTHOR("Felipe Balbi <balbi@xxxxxx>");
> MODULE_LICENSE("Dual BSD/GPL");
> MODULE_DESCRIPTION("DesignWare USB3 OMAP Glue Layer");
> +
> -module_platform_driver(dwc3_omap_driver);
> ++module_platform_driver(dwc3_omap_driver);
>
> The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50:
>
> Linux 3.2-rc5 (2011-12-09 15:09:32 -0800)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/dwc3
Now pulled and pushed out, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
