| Message ID | 20150624173710.3248ece8@canb.auug.org.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 24 Jun 2015 17:37:10 +1000 > I have applied this patch for today: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Wed, 24 Jun 2015 17:29:51 +1000 > Subject: [PATCH] drivers: net: xgene: fix for ACPI support without ACPI > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied, thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) {
Hi all, After merging the net-next tree, today's linux-next build (KCONFIG_NAME) failed like this: drivers/net/ethernet/apm/xgene/xgene_enet_main.c: In function 'xgene_get_port_id_acpi': drivers/net/ethernet/apm/xgene/xgene_enet_main.c:880:2: error: implicit declaration of function 'acpi_evaluate_integer' [-Werror=implicit-function-declaration] status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_SUN", NULL, &temp); ^ drivers/net/ethernet/apm/xgene/xgene_enet_main.c: At top level: drivers/net/ethernet/apm/xgene/xgene_enet_main.c:874:12: warning: 'xgene_get_port_id_acpi' defined but not used [-Wunused-function] static int xgene_get_port_id_acpi(struct device *dev, ^ Caused by commit 0738c54d6324 ("drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI interface of APM X-Gene SoC ethernet controller"). I have applied this patch for today: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 24 Jun 2015 17:29:51 +1000 Subject: [PATCH] drivers: net: xgene: fix for ACPI support without ACPI Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 ++ 1 file changed, 2 insertions(+)