Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / drivers / net / ethernet / allwinner / sun4i-emac.c

diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 0cc21437478c43a031fbeb09be434e2819797f52..511f6eecd58bc8153ef9cbf6a0ae021e91d8d889 100644 (file)
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -929,6 +929,9 @@ static int emac_resume(struct platform_device *dev)
 }
 
 static const struct of_device_id emac_of_match[] = {
+       {.compatible = "allwinner,sun4i-a10-emac",},
+
+       /* Deprecated */
        {.compatible = "allwinner,sun4i-emac",},
        {},
 };