Messages in this thread | | | Date | Mon, 10 Nov 2014 15:28:01 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the driver-core tree with the l2-mtd tree |
| |
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in drivers/mtd/devices/docg3.c between commit a59459f29fb7 ("mtd: docg3: add device-tree support") from the l2-mtd tree and commit c37c1e160546 ("mtd: devices: drop owner assignment from platform_drivers") 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/mtd/devices/docg3.c index 0d9d3ee68b61,72346048532d..000000000000 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@@ -2130,8 -2129,6 +2130,7 @@@ MODULE_DEVICE_TABLE(of, docg3_dt_ids) static struct platform_driver g3_driver = { .driver = { .name = "docg3", - .owner = THIS_MODULE, + .of_match_table = of_match_ptr(docg3_dt_ids), }, .suspend = docg3_suspend, .resume = docg3_resume, [unhandled content-type:application/pgp-signature] | |