linux-next: manual merge of the mmc tree with the s5p tree

[Stephen Rothwell]

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sdhci-s3c.c between commit c1c4b66dc010 ("mmc:
sdhci-s3c: add platform data for the second capability") from the s5p
tree and commit 1c352c37ee23 ("mmc: sdhci-s3c: Enable runtime power
management") from the mmc tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/mmc/host/sdhci-s3c.c
index a2bfbe0,312aaf4..0000000
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@@ -714,9 -706,11 +703,14 @@@ static int __devinit sdhci_s3c_probe(st
  	if (pdata->host_caps)
  		host->mmc->caps |= pdata->host_caps;
  
 +	if (pdata->host_caps2)
 +		host->mmc->caps2 |= pdata->host_caps2;
 +
+ 	pm_runtime_enable(&pdev->dev);
+ 	pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
+ 	pm_runtime_use_autosuspend(&pdev->dev);
+ 	pm_suspend_ignore_children(&pdev->dev, 1);
+ 
  	ret = sdhci_add_host(host);
  	if (ret) {
  		dev_err(dev, "sdhci_add_host() failed\n");

Attachment: pgp00000.pgp
Description: PGP signature