aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2013-11-18 20:37:29 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-25 03:03:13 -0500
commit209e64f9ed28e4e686c3dfb0ed89069849d679c6 (patch)
tree0e44447ae705616647e97824550a656ceb4fe6e4
parent61c6375d55235e67d15b4a12cfe90d02710cef5e (diff)
gpiolib: fix of_find_gpio() when OF not defined
The prototype for static GPIO lookup functions has been updated to use an explicit type for GPIO lookup flags. Unfortunately the definition of of_find_gpio() when CONFIG_OF is not defined has been omitted, which triggers a warning. This patch fixes this. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpiolib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 14ab16fbaad5..ac53a9593662 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -2302,7 +2302,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
2302} 2302}
2303#else 2303#else
2304static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, 2304static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
2305 unsigned int idx, unsigned long *flags) 2305 unsigned int idx,
2306 enum gpio_lookup_flags *flags)
2306{ 2307{
2307 return ERR_PTR(-ENODEV); 2308 return ERR_PTR(-ENODEV);
2308} 2309}