diff --git a/[refs] b/[refs]
index 8caf66d20ce8..2c799e7b0d51 100644
--- 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
index f09fe7b20e82..8bda3654ae51 100644
--- 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),
 	},
 };