---

yaml --- r: 343143 b: refs/heads/master c: ec4f7b8 h: refs/heads/master i: 343141: 642e90e 343139: ba937af 343135: 6aaa00e v: v3
git-mirror · Dec 6, 2012 · 40d71d5 · 40d71d5
1 parent 0c201ac
commit 40d71d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 216f2b9c95ac6e4f00b08df807bc4454434a9afb
+refs/heads/master: ec4f7b88b4a89253ec922d48f77b269ce5cffc2c
diff --git a/trunk/drivers/regulator/gpio-regulator.c b/trunk/drivers/regulator/gpio-regulator.c
@@ -364,18 +364,20 @@ static int __devexit gpio_regulator_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#if defined(CONFIG_OF)
 static const struct of_device_id regulator_gpio_of_match[] __devinitconst = {
 	{ .compatible = "regulator-gpio", },
 	{},
 };
+#endif
 
 static struct platform_driver gpio_regulator_driver = {
 	.probe		= gpio_regulator_probe,
 	.remove		= __devexit_p(gpio_regulator_remove),
 	.driver		= {
 		.name		= "gpio-regulator",
 		.owner		= THIS_MODULE,
-		.of_match_table = regulator_gpio_of_match,
+		.of_match_table = of_match_ptr(regulator_gpio_of_match),
 	},
 };