aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2016-06-07 14:19:06 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2016-06-07 14:19:06 +0100
commit1a839e51eee497bf6dee822cdb4753fdc0b695bb (patch)
treefaa77182caea8446b4681645051436db88059a5f
parentb59c0204dd164780bc8ea400bb2b1bf97c5230bd (diff)
parent37a2c1d1172acee64350fe27860f70043186b37a (diff)
downloadleg-kernel-1a839e51eee497bf6dee822cdb4753fdc0b695bb.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 18ac52ded696..f6ef16a20e60 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),
},
};