aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2016-05-17 12:39:38 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2016-05-17 12:39:38 +0100
commit304003b89f5f34b765c8d135c390c5611abb9138 (patch)
treee4d0d0f331632fdb917aca5043235b55ba19331f
parent0792e66eb70d693bd91eac0ad0210f4bcdb70b6d (diff)
parent2e4752043fd7f5726698b5c9c933d08c0a3642e0 (diff)
downloadleg-kernel-304003b89f5f34b765c8d135c390c5611abb9138.tar.gz
Merge branch 'topic-fvp' into leg-kernel
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index c5ed27c54724..993630359fe4 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -82,6 +82,7 @@ static const char version[] =
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
+#include <linux/acpi.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -2472,6 +2473,14 @@ static struct dev_pm_ops smc_drv_pm_ops = {
.resume = smc_drv_resume,
};
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id smc91x_acpi_match[] = {
+ { "LNRO0003", },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, smc91x_acpi_match);
+#endif
+
static struct platform_driver smc_driver = {
.probe = smc_drv_probe,
.remove = smc_drv_remove,
@@ -2479,6 +2488,7 @@ static struct platform_driver smc_driver = {
.name = CARDNAME,
.pm = &smc_drv_pm_ops,
.of_match_table = of_match_ptr(smc91x_match),
+ .acpi_match_table = ACPI_PTR(smc91x_acpi_match),
},
};