Subject: linux-next: manual merge of the usb-gadget tree with the driver-core tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Nov 2014 16:08:24 +1100

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/gadget/udc/pxa27x_udc.c between commit 6d3f5f2d895b ("usb:
gadget: udc: drop owner assignment from platform_drivers") from the
driver-core tree and commit 1803fe15ad54 ("usb: gadget: pxa27x_udc: add
devicetree support") from the usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/usb/gadget/udc/pxa27x_udc.c
index 61bceedf515d,69e7b816d880..000000000000
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@@ -2614,6 -2589,8 +2589,7 @@@ MODULE_ALIAS("platform:pxa27x-udc")
  static struct platform_driver udc_driver = {
  	.driver		= {
  		.name	= "pxa27x-udc",
 -		.owner	= THIS_MODULE,
+ 		.of_match_table = of_match_ptr(udc_pxa_dt_ids),
  	},
  	.probe		= pxa_udc_probe,
  	.remove		= pxa_udc_remove,