diff options
| author | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-10-31 18:47:36 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:05 (GMT) |
| commit | 5050feba3979d427ca09224422600b67ec0953c3 (patch) | |
| tree | 3693e2abda7efa361aabf4f490c2a80064009a14 /drivers/net/ethernet | |
| parent | b89ac5428b869cd9125dd9a4cad5a87a08fef446 (diff) | |
| parent | fde49ddde7f804071041d46069f35943b4f87c3b (diff) | |
| download | linux-fsl-qoriq-5050feba3979d427ca09224422600b67ec0953c3.tar.xz | |
Merge remote-tracking branch 'ls1/LS1-SDK'
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 2e081da..c937209 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -42,12 +42,14 @@ #include <linux/phy.h> #include <linux/sort.h> #include <linux/if_vlan.h> -#ifdef CONFIG_PM -#include <sysdev/fsl_soc.h> -#endif #include "gianfar.h" +int __attribute__ ((weak)) mpc85xx_pmc_set_wake(struct device *dev, bool enable) +{ + return 0; +} + #define GFAR_MAX_COAL_USECS 0xffff #define GFAR_MAX_COAL_FRAMES 0xff static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, |