diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-24 03:29:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-24 04:00:57 -0400 |
commit | 8beeef8de49d2d9707c55747fdcef3da2b56ac68 (patch) | |
tree | 095bf8063e2725b06ccc85148c3e06c593041c42 | |
parent | 12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322 (diff) |
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>
-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 = { | |||
871 | .ndo_set_mac_address = xgene_enet_set_mac_address, | 871 | .ndo_set_mac_address = xgene_enet_set_mac_address, |
872 | }; | 872 | }; |
873 | 873 | ||
874 | #ifdef CONFIG_ACPI | ||
874 | static int xgene_get_port_id_acpi(struct device *dev, | 875 | static int xgene_get_port_id_acpi(struct device *dev, |
875 | struct xgene_enet_pdata *pdata) | 876 | struct xgene_enet_pdata *pdata) |
876 | { | 877 | { |
@@ -886,6 +887,7 @@ static int xgene_get_port_id_acpi(struct device *dev, | |||
886 | 887 | ||
887 | return 0; | 888 | return 0; |
888 | } | 889 | } |
890 | #endif | ||
889 | 891 | ||
890 | static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata) | 892 | static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata) |
891 | { | 893 | { |