Subject: linux-next: manual merge of the mfd tree with the sh tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 17 Sep 2010 12:05:48 +1000

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/mfd/sh_mobile_sdhi.c between commit
25ab998e2eff46d2e6ede80c9fc02a349fa005a3 ("mfd: Fix up section mismatches
in SH SDHI") from the sh tree and commit
6d1b291f5f2728547a8d681b46657ed9528145bf ("mfd: Allow the platform to
specify the sh_mobile_sdhi get_cd handler") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/mfd/sh_mobile_sdhi.c
index 49b4d06,9d43316..0000000
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@@ -65,7 -65,18 +65,18 @@@ static void sh_mobile_sdhi_set_pwr(stru
  		p->set_pwr(pdev, state);
  }
  
+ static int sh_mobile_sdhi_get_cd(struct platform_device *tmio)
+ {
+ 	struct platform_device *pdev = to_platform_device(tmio->dev.parent);
+ 	struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
+ 
+ 	if (p && p->get_cd)
+ 		return p->get_cd(pdev);
+ 	else
+ 		return -ENOSYS;
+ }
+ 
 -static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
 +static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
  {
  	struct sh_mobile_sdhi *priv;
  	struct tmio_mmc_data *mmc_data;