Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / linux / gpio.h

diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index e41f7dd1ae676eb778a00c0f7cdced047312eff7..32720baf70f1c8f1e46741ff8006d44da82f6188 100644 (file)
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 
 struct device;
+struct gpio;
 struct gpio_chip;
 
 /*
@@ -34,6 +35,17 @@ static inline int gpio_request(unsigned gpio, const char *label)
        return -ENOSYS;
 }
 
+static inline int gpio_request_one(unsigned gpio,
+                                       unsigned long flags, const char *label)
+{
+       return -ENOSYS;
+}
+
+static inline int gpio_request_array(struct gpio *array, size_t num)
+{
+       return -ENOSYS;
+}
+
 static inline void gpio_free(unsigned gpio)
 {
        might_sleep();
@@ -42,6 +54,14 @@ static inline void gpio_free(unsigned gpio)
        WARN_ON(1);
 }
 
+static inline void gpio_free_array(struct gpio *array, size_t num)
+{
+       might_sleep();
+
+       /* GPIO can never have been requested */
+       WARN_ON(1);
+}
+
 static inline int gpio_direction_input(unsigned gpio)
 {
        return -ENOSYS;