diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-24 09:29:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 10:00:57 +0200 |
| commit | 8beeef8de49d2d9707c55747fdcef3da2b56ac68 (patch) | |
| tree | 095bf8063e2725b06ccc85148c3e06c593041c42 /drivers/net/ethernet/apm | |
| parent | Merge branch 'mlx-next' (diff) | |
| download | linux-8beeef8de49d2d9707c55747fdcef3da2b56ac68.tar.xz linux-8beeef8de49d2d9707c55747fdcef3da2b56ac68.zip | |
drivers: net: xgene: fix for ACPI support without ACPI
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apm')
| -rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index b334f279ce8d..95153b234c71 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -871,6 +871,7 @@ static const struct net_device_ops xgene_ndev_ops = { .ndo_set_mac_address = xgene_enet_set_mac_address, }; +#ifdef CONFIG_ACPI static int xgene_get_port_id_acpi(struct device *dev, struct xgene_enet_pdata *pdata) { @@ -886,6 +887,7 @@ static int xgene_get_port_id_acpi(struct device *dev, return 0; } +#endif static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata) { |