summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpiolib.c
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2013-11-19 10:37:29 +0900
committerLinus Walleij <linus.walleij@linaro.org>2013-11-25 09:03:13 +0100
commit209e64f9ed28e4e686c3dfb0ed89069849d679c6 (patch)
tree0e44447ae705616647e97824550a656ceb4fe6e4 /drivers/gpio/gpiolib.c
parent61c6375d55235e67d15b4a12cfe90d02710cef5e (diff)
downloadlinux-stable-209e64f9ed28e4e686c3dfb0ed89069849d679c6.tar.gz
linux-stable-209e64f9ed28e4e686c3dfb0ed89069849d679c6.tar.bz2
linux-stable-209e64f9ed28e4e686c3dfb0ed89069849d679c6.zip
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>
Diffstat (limited to 'drivers/gpio/gpiolib.c')
-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,
}
#else
static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
- unsigned int idx, unsigned long *flags)
+ unsigned int idx,
+ enum gpio_lookup_flags *flags)
{
return ERR_PTR(-ENODEV);
}