Hi Grant,
Today's linux-next merge of the devicetree tree got a conflict in
drivers/net/gianfar.c between commit
b14ed884df5968b0977114ebd5a22f58d0d15315 ("gianfar: Remove legacy PM
callbacks") from the net tree and commit
030d1870b731924034caf0c874981e2ed4f1becc ("drivers/net/of: don't use
deprecated field in of_platform_driver") from the devicetree 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/net/gianfar.c
index c6791cd,c3b292a..0000000
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@@ -3167,12 -3054,16 +3167,14 @@@ MODULE_DEVICE_TABLE(of, gfar_match)
/* Structure for a device driver */
static struct of_platform_driver gfar_driver = {
- .name = "fsl-gianfar",
- .match_table = gfar_match,
-
+ .driver = {
+ .name = "fsl-gianfar",
+ .owner = THIS_MODULE,
+ .pm = GFAR_PM_OPS,
+ .of_match_table = gfar_match,
+ },
.probe = gfar_probe,
.remove = gfar_remove,
- .driver.pm = GFAR_PM_OPS,
- .suspend = gfar_legacy_suspend,
- .resume = gfar_legacy_resume,
};
static int __init gfar_init(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
