From 021a0c37d9435056c150f0834f249e29eca2a830 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Wed, 19 Dec 2012 01:17:09 +0000
Subject: [PATCH] --- yaml --- r: 347327 b: refs/heads/master c:
 89ce376c6bdc936515147ff14f8a62cead965683 h: refs/heads/master i:   347325:
 bff6f7c115abcdd9a03ad4e5e3a4853dbb9e61d7   347323:
 f7708ae87220702958c2be1e7cb1588f097cfce0   347319:
 1b0777ba1cd7a7540d3d27ed1e3a4d8899a183c0   347311:
 faad94349d7e9bfb1e824f010730841cb3712836   347295:
 84ebe6715e663404ac17d4c76cee738f272f3488   347263:
 448456cf7303aa7d74679ea06464a11a3e105468 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/ethernet/smsc/smc91x.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0a8f08a03242..1daf16396622 100644
--- 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
index 022b45bc14ff..a670d23d9340 100644
--- 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),
 	},
 };