Linux v3.19-8784-gb2b89ebfc0f0

This commit is contained in:
Josh Boyer 2015-02-18 16:50:20 -05:00
commit 6bfe64015d
10 changed files with 26 additions and 16 deletions

View file

@ -17788,10 +17788,10 @@ index 44b1537..a4a53a7 100644
}
static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
@@ -1030,17 +1027,17 @@ static const struct acpi_device_id xgene_enet_acpi_match[] = {
MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);
@@ -1031,18 +1031,18 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);
#endif
#ifdef CONFIG_OF
-static struct of_device_id xgene_enet_of_match[] = {
+static struct of_device_id xgene_enet_match[] = {
{.compatible = "apm,xgene-enet",},
@ -17800,6 +17800,7 @@ index 44b1537..a4a53a7 100644
-MODULE_DEVICE_TABLE(of, xgene_enet_of_match);
+MODULE_DEVICE_TABLE(of, xgene_enet_match);
#endif
static struct platform_driver xgene_enet_driver = {
.driver = {