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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/syscon.c between commit d4ad08b424c1 ("mfd: syscon:
Decouple syscon interface from platform devices") from the mfd tree and
commit 78a835416ad6 ("mfd: drop owner assignment from
platform_drivers") from the driver-core 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/mfd/syscon.c
index 72373b113885,e85c052b302c..000000000000
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@@ -219,7 -166,7 +219,6 @@@ static const struct platform_device_id 
  static struct platform_driver syscon_driver = {
  	.driver = {
  		.name = "syscon",
- 		.owner = THIS_MODULE,
 -		.of_match_table = of_syscon_match,
  	},
  	.probe		= syscon_probe,
  	.id_table	= syscon_ids,

Attachment: pgpufIM6NHQyh.pgp
Description: OpenPGP digital signature