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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
Remove redundant suspend and resume callbacks") from the mmc tree and
commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") 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@canb.auug.org.au

diff --cc drivers/mmc/host/mvsdio.c
index 22ba4d33e95b,deecee08c288..000000000000
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@@ -845,7 -872,10 +845,8 @@@ static const struct of_device_id mvsdio
  MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
  
  static struct platform_driver mvsd_driver = {
- 	.remove		= __exit_p(mvsd_remove),
+ 	.probe		= mvsd_probe,
+ 	.remove		= mvsd_remove,
 -	.suspend	= mvsd_suspend,
 -	.resume		= mvsd_resume,
  	.driver		= {
  		.name	= DRIVER_NAME,
  		.of_match_table = mvsdio_dt_ids,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Mon, Oct 28, 2013 at 10:20:07PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
> Remove redundant suspend and resume callbacks") from the mmc tree and
> commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") from
> the driver-core tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h