aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <cbouatmailru@gmail.com>2010-10-27 15:33:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-27 18:03:06 -0700
commit09cd9527d621640d4dd231dff77b681e711d8e4b (patch)
treefcd333ea3d8f27c849f7a51a7fcf67646886b948
parentaeec56e331c6d2750de02ef34b305338305ca690 (diff)
downloadkernel_samsung_smdk4412-09cd9527d621640d4dd231dff77b681e711d8e4b.zip
kernel_samsung_smdk4412-09cd9527d621640d4dd231dff77b681e711d8e4b.tar.gz
kernel_samsung_smdk4412-09cd9527d621640d4dd231dff77b681e711d8e4b.tar.bz2
gpiolib: fix HAVE_GPIO_LIB leftovers in asm-generic/gpio.h
commit 7444a72effa632fcd8edc566f88 ("gpiolib: allow user-selection") removed HAVE_GPIO_LIB Kconfig symbol, but the header file still uses the name [to confuse readers wrt #ifdef/#else/#endif location]. The real Kconfig symbol nowadays is CONFIG_GPIOLIB. Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-generic/gpio.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 8ca18e2..ff5c660 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -210,7 +210,7 @@ extern void gpio_unexport(unsigned gpio);
#endif /* CONFIG_GPIO_SYSFS */
-#else /* !CONFIG_HAVE_GPIO_LIB */
+#else /* !CONFIG_GPIOLIB */
static inline int gpio_is_valid(int number)
{
@@ -239,7 +239,7 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value)
gpio_set_value(gpio, value);
}
-#endif /* !CONFIG_HAVE_GPIO_LIB */
+#endif /* !CONFIG_GPIOLIB */
#ifndef CONFIG_GPIO_SYSFS