summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-07-27 09:19:29 +0300
committerDavid S. Miller <davem@davemloft.net>2016-07-27 09:19:29 +0300
commit36232012344b8db67052432742deaf17f82e70e6 (patch)
treec79caee771ef53ab1fb0ce428b075007b30c2dff /drivers
parentd3480615cf00c6f615cdb61a9d03386574b93342 (diff)
downloadlinux-36232012344b8db67052432742deaf17f82e70e6.tar.xz
xgene: Fix build warning with ACPI disabled.
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c: In function 'xgene_enet_phy_connect': drivers/net/ethernet/apm/xgene/xgene_enet_hw.c:759:22: warning: unused variable 'adev' [-Wunused-variable] Fixes: 8089a96f601b ("drivers: net: xgene: Add backward compatibility") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/apm/xgene/xgene_enet_hw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 8a2a221a9838..7714b7d4026a 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -756,7 +756,6 @@ int xgene_enet_phy_connect(struct net_device *ndev)
struct device_node *np;
struct phy_device *phy_dev;
struct device *dev = &pdata->pdev->dev;
- struct acpi_device *adev;
int i;
if (dev->of_node) {
@@ -781,7 +780,7 @@ int xgene_enet_phy_connect(struct net_device *ndev)
pdata->phy_dev = phy_dev;
} else {
#ifdef CONFIG_ACPI
- adev = acpi_phy_find_device(dev);
+ struct acpi_device *adev = acpi_phy_find_device(dev);
if (adev)
pdata->phy_dev = adev->driver_data;