diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2013-03-28 07:34:56 -0400 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2013-04-16 05:47:14 -0400 |
commit | 76ec9d18b8972f1b228f819f6126c9f022b3e642 (patch) | |
tree | c860b7360ffc3a99b2eb6db8cf132bffd4191804 /include | |
parent | a2523d3cdab76fbda28414fd82743815f3cc3df7 (diff) |
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')
-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 { | |||
39 | const char *label; | 39 | const char *label; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | #ifdef CONFIG_GENERIC_GPIO | 42 | #ifdef CONFIG_GPIOLIB |
43 | 43 | ||
44 | #ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H | 44 | #ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H |
45 | #include <asm/gpio.h> | 45 | #include <asm/gpio.h> |
@@ -74,7 +74,7 @@ static inline int irq_to_gpio(unsigned int irq) | |||
74 | 74 | ||
75 | #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */ | 75 | #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */ |
76 | 76 | ||
77 | #else /* ! CONFIG_GENERIC_GPIO */ | 77 | #else /* ! CONFIG_GPIOLIB */ |
78 | 78 | ||
79 | #include <linux/kernel.h> | 79 | #include <linux/kernel.h> |
80 | #include <linux/types.h> | 80 | #include <linux/types.h> |
@@ -226,7 +226,7 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip) | |||
226 | WARN_ON(1); | 226 | WARN_ON(1); |
227 | } | 227 | } |
228 | 228 | ||
229 | #endif /* ! CONFIG_GENERIC_GPIO */ | 229 | #endif /* ! CONFIG_GPIOLIB */ |
230 | 230 | ||
231 | struct device; | 231 | struct device; |
232 | 232 | ||