---

yaml --- r: 347327 b: refs/heads/master c: 89ce376 h: refs/heads/master i: 347325: bff6f7c 347323: f7708ae 347319: 1b0777b 347311: faad943 347295: 84ebe67 347263: 448456c v: v3
git-mirror · Dec 19, 2012 · 021a0c3 · 021a0c3
1 parent ac982d2
commit 021a0c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd7790286b4acd52ecbd8123b1ce052cf1b931b1
+refs/heads/master: 89ce376c6bdc936515147ff14f8a62cead965683
diff --git a/trunk/drivers/net/ethernet/smsc/smc91x.c b/trunk/drivers/net/ethernet/smsc/smc91x.c
@@ -2386,8 +2386,6 @@ static const struct of_device_id smc91x_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, smc91x_match);
-#else
-#define smc91x_match NULL
 #endif
 
 static struct dev_pm_ops smc_drv_pm_ops = {
@@ -2402,7 +2400,7 @@ static struct platform_driver smc_driver = {
 		.name	= CARDNAME,
 		.owner	= THIS_MODULE,
 		.pm	= &smc_drv_pm_ops,
-		.of_match_table = smc91x_match,
+		.of_match_table = of_match_ptr(smc91x_match),
 	},
 };