From d71d7f9f9728b8c746fd2fdf3dfe534af6bc5566 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 4 Apr 2012 16:14:48 +0100
Subject: [PATCH] --- yaml --- r: 307664 b: refs/heads/master c:
 2c96922ae3f0bfb7324a7a433d96d319fe6de729 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/gpio.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2768286e8b11..70c2ecd79aec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5f93117f4ac24b8493cda67e6a1443517d26845
+refs/heads/master: 2c96922ae3f0bfb7324a7a433d96d319fe6de729
diff --git a/trunk/include/linux/gpio.h b/trunk/include/linux/gpio.h
index af511a682925..d1890d46b6ce 100644
--- a/trunk/include/linux/gpio.h
+++ b/trunk/include/linux/gpio.h
@@ -60,6 +60,12 @@ static inline int gpio_request(unsigned gpio, const char *label)
 	return -ENOSYS;
 }
 
+static inline int devm_gpio_request(struct device *dev, unsigned gpio,
+				    const char *label)
+{
+	return -ENOSYS;
+}
+
 static inline int gpio_request_one(unsigned gpio,
 					unsigned long flags, const char *label)
 {
@@ -79,6 +85,14 @@ static inline void gpio_free(unsigned gpio)
 	WARN_ON(1);
 }
 
+static inline void devm_gpio_free(struct device *dev, unsigned gpio)
+{
+	might_sleep();
+
+	/* GPIO can never have been requested */
+	WARN_ON(1);
+}
+
 static inline void gpio_free_array(const struct gpio *array, size_t num)
 {
 	might_sleep();