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 bd0955ed6b1b ("mmc:
sdhci-s3c: add platform data for the second capability") from the s5p
tree and commit 7880741a0625 ("mmc: sdhci-s3c: derive transfer width host
capability from max_width in platform data") from the mmc tree.

Just context changes.  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 b19e7d4,3bf509b..0000000
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@@ -518,6 -683,17 +683,14 @@@ static int __devinit sdhci_s3c_probe(st
  	if (pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
  		host->mmc->caps = MMC_CAP_NONREMOVABLE;
  
+ 	switch (pdata->max_width) {
+ 	case 8:
+ 		host->mmc->caps |= MMC_CAP_8_BIT_DATA;
+ 	case 4:
+ 		host->mmc->caps |= MMC_CAP_4_BIT_DATA;
+ 		break;
+ 	}
+ 
 -	if (pdata->host_caps)
 -		host->mmc->caps |= pdata->host_caps;
 -
  	if (pdata->pm_caps)
  		host->mmc->pm_caps |= pdata->pm_caps;

Attachment: pgp00000.pgp
Description: PGP signature