diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-27 12:41:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-27 12:41:17 +0100 |
| commit | ff5a7088f0f04dd246e514f898cab0c863c3598d (patch) | |
| tree | 68a8f588e60fba05ee54b74b32a3269a72d130b9 /drivers/net/ethernet/allwinner/sun4i-emac.c | |
| parent | 7e74efcf76c16f851df5c838c143c4a1865ea9fa (diff) | |
| parent | e3703f8cdfcf39c25c4338c3ad8e68891cca3731 (diff) | |
| download | talos-op-linux-ff5a7088f0f04dd246e514f898cab0c863c3598d.tar.gz talos-op-linux-ff5a7088f0f04dd246e514f898cab0c863c3598d.zip | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/allwinner/sun4i-emac.c')
| -rw-r--r-- | drivers/net/ethernet/allwinner/sun4i-emac.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 0cc21437478c..511f6eecd58b 100644 --- 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",}, {}, }; |
