Messages in this thread | | | Date | Mon, 28 Oct 2013 22:20:07 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the mmc tree |
| |
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, [unhandled content-type:application/pgp-signature] | |