---

yaml --- r: 307664 b: refs/heads/master c: 2c96922 h: refs/heads/master v: v3
git-mirror · Apr 6, 2012 · d71d7f9 · d71d7f9
1 parent 91d5249
commit d71d7f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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();