diff options
| author | Axel Lin <axel.lin@ingics.com> | 2012-12-04 10:32:05 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-06 15:22:52 +0900 |
| commit | ec4f7b88b4a89253ec922d48f77b269ce5cffc2c (patch) | |
| tree | 41350fe383803537cc6ccb7aa9edc44b20e3cc85 /drivers | |
| parent | 216f2b9c95ac6e4f00b08df807bc4454434a9afb (diff) | |
| download | linux-ec4f7b88b4a89253ec922d48f77b269ce5cffc2c.tar.gz | |
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 <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/gpio-regulator.c | 4 |
1 files changed, 3 insertions, 1 deletions
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), }, }; |