Message ID | 1435134100-12460-2-git-send-email-stripathi@apm.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Hi , Any comments on this patch . On Wed, Jun 24, 2015 at 1:51 PM, Suman Tripathi <stripathi@apm.com> wrote: > This patch guards the acpi_evaluate_interger function as it fails > the build for NON_ACPI CONFIG. > > Signed-off-by: Iyappan Subramanian <isubramanian@apm.com> > Signed-off-by: Suman Tripathi <stripathi@apm.com> > Reported-by: kbuild test robot <fengguang.wu@intel.com> > --- > drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > index 4e83d4c..70b9ef6 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) > { > -- > 1.8.2.1 >
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 4e83d4c..70b9ef6 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) {