projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mvebu-dt-3.15' of git://git.infradead.org/linux-mvebu into next/dt
[cascardo/linux.git]
/
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
0cc2143
..
511f6ee
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",},
{},
};