From 0e3397f719dcb0cbc215ad8755f607e621fb1655 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Wed, 27 Oct 2010 15:33:16 -0700
Subject: [PATCH] --- yaml --- r: 218505 b: refs/heads/master c:
 09cd9527d621640d4dd231dff77b681e711d8e4b h: refs/heads/master i:   218503:
 cdca86d68662924c8479070af30469a7535071f3 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-generic/gpio.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6942e8f4940e..e6fe0153ea74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aeec56e331c6d2750de02ef34b305338305ca690
+refs/heads/master: 09cd9527d621640d4dd231dff77b681e711d8e4b
diff --git a/trunk/include/asm-generic/gpio.h b/trunk/include/asm-generic/gpio.h
index 8ca18e26d7e3..ff5c66080c8c 100644
--- a/trunk/include/asm-generic/gpio.h
+++ b/trunk/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