diff options
| author |   Alexandre Courbot <acourbot@nvidia.com> | 2013-03-28 04:34:56 -0700 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2013-04-16 18:47:14 +0900 |
| commit | 76ec9d18b8972f1b228f819f6126c9f022b3e642 (patch) | |
| tree | c860b7360ffc3a99b2eb6db8cf132bffd4191804 /include/linux/gpio.h | |
| parent | blackfin: force use of gpiolib (diff) | |
| download | linux-dev-76ec9d18b8972f1b228f819f6126c9f022b3e642.tar.xz linux-dev-76ec9d18b8972f1b228f819f6126c9f022b3e642.zip | |
Convert selectors of GENERIC_GPIO to GPIOLIB
GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on
GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'include/linux/gpio.h')
| -rw-r--r-- | include/linux/gpio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index f6c7ae3e223b..552e3f46e4a3 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h @@ -39,7 +39,7 @@ struct gpio { const char *label; }; -#ifdef CONFIG_GENERIC_GPIO +#ifdef CONFIG_GPIOLIB #ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H #include <asm/gpio.h> @@ -74,7 +74,7 @@ static inline int irq_to_gpio(unsigned int irq) #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */ -#else /* ! CONFIG_GENERIC_GPIO */ +#else /* ! CONFIG_GPIOLIB */ #include <linux/kernel.h> #include <linux/types.h> @@ -226,7 +226,7 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip) WARN_ON(1); } -#endif /* ! CONFIG_GENERIC_GPIO */ +#endif /* ! CONFIG_GPIOLIB */ struct device; |