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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/watchdog/imx2_wdt.c between commit 6dc21678dbd9 ("watchdog:
imx2_wdt: Add power management support") from the watchdog tree and
commit fa21a580dea4 ("watchdog: 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/watchdog/imx2_wdt.c
index b333283b24a7,65b84d8c0b93..000000000000
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@@ -383,8 -337,6 +383,7 @@@ static struct platform_driver imx2_wdt_
  	.shutdown	= imx2_wdt_shutdown,
  	.driver		= {
  		.name	= DRIVER_NAME,
- 		.owner	= THIS_MODULE,
 +		.pm     = &imx2_wdt_pm_ops,
  		.of_match_table = imx2_wdt_dt_ids,
  	},
  };

Attachment: pgpNKoip8CGcy.pgp
Description: OpenPGP digital signature