---

yaml --- r: 312505 b: refs/heads/master c: abcfaf2 h: refs/heads/master i: 312503: be864ca v: v3
git-mirror · Jun 3, 2012 · a3c7438 · a3c7438
1 parent 3563e26
commit a3c7438
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: 133d4016f1783b21e9458430fa7c0c610c010037
+refs/heads/master: abcfaf23c7d8494bd3b3266f7a78e9efe6206ca4
diff --git a/trunk/drivers/regulator/fixed.c b/trunk/drivers/regulator/fixed.c
@@ -296,8 +296,6 @@ static const struct of_device_id fixed_of_match[] __devinitconst = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, fixed_of_match);
-#else
-#define fixed_of_match NULL
 #endif
 
 static struct platform_driver regulator_fixed_voltage_driver = {
@@ -306,7 +304,7 @@ static struct platform_driver regulator_fixed_voltage_driver = {
 	.driver		= {
 		.name		= "reg-fixed-voltage",
 		.owner		= THIS_MODULE,
-		.of_match_table = fixed_of_match,
+		.of_match_table = of_match_ptr(fixed_of_match),
 	},
 };