linux-next: manual merge of the akpm-current tree with the driver-core tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/rtc/rtc-omap.c between commit 0929ae376ef3 ("rtc: drop owner
assignment from platform_drivers") from the driver-core tree and commit
700abe25a31a ("rtc: omap: remove DRIVER_NAME macro") from the
akpm-current tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/rtc/rtc-omap.c
index ae444a8bd602,fba13e53c278..000000000000
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@@ -568,7 -718,8 +718,7 @@@ static struct platform_driver omap_rtc_
  	.remove		= __exit_p(omap_rtc_remove),
  	.shutdown	= omap_rtc_shutdown,
  	.driver		= {
- 		.name	= DRIVER_NAME,
+ 		.name	= "omap_rtc",
 -		.owner	= THIS_MODULE,
  		.pm	= &omap_rtc_pm_ops,
  		.of_match_table = omap_rtc_of_match,
  	},

Attachment: pgp1IFRFG4yJF.pgp
Description: OpenPGP digital signature