diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2014-07-30 14:14:35 +0100 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2014-07-30 14:14:35 +0100 |
| commit | 2189d8891fd5ae91eeaa560370191a3f8206bcbf (patch) | |
| tree | 640b4a2d9193aa2a98a67866535e85d7264a0e15 | |
| parent | b060d71951252181c624a6265a39fd2e6cb33754 (diff) | |
| download | leg-kernel-2189d8891fd5ae91eeaa560370191a3f8206bcbf.tar.gz | |
net: smsc911x fix ACPI=n compileleg-20140730.0
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 2b13ad2a827f..2f1fb644fb4a 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2431,7 +2431,7 @@ static int smsc911x_probe_config_acpi(struct smsc911x_platform_config *config, } #else static int smsc911x_probe_config_acpi(struct smsc911x_platform_config *config, - acpi_handle *ahandle) + void *ahandle) { return -ENODEV; } @@ -2440,7 +2440,6 @@ static int smsc911x_probe_config_acpi(struct smsc911x_platform_config *config, static int smsc911x_drv_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; - acpi_handle *ahandle = ACPI_HANDLE(&pdev->dev); struct net_device *dev; struct smsc911x_data *pdata; struct smsc911x_platform_config *config = dev_get_platdata(&pdev->dev); @@ -2506,7 +2505,8 @@ static int smsc911x_drv_probe(struct platform_device *pdev) retval = smsc911x_probe_config_dt(&pdata->config, np); if (retval) - retval = smsc911x_probe_config_acpi(&pdata->config, ahandle); + retval = smsc911x_probe_config_acpi(&pdata->config, + ACPI_HANDLE(&pdev->dev)); if (retval && config) { /* copy config parameters across to pdata */ |