From: Axel Lin Date: Tue, 4 Dec 2012 02:32:05 +0000 (+0800) Subject: regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec4f7b88b4a89253ec922d48f77b269ce5cffc2c;p=openwrt%2Fstaging%2Fblogic.git regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match Use of_match_ptr and add ifdef CONFIG_OF guard for regulator_gpio_of_match. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index dc9260545b80..8c4e23739494 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c @@ -364,10 +364,12 @@ 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, @@ -375,7 +377,7 @@ static struct platform_driver gpio_regulator_driver = { .driver = { .name = "gpio-regulator", .owner = THIS_MODULE, - .of_match_table = regulator_gpio_of_match, + .of_match_table = of_match_ptr(regulator_gpio_of_match), }, };