From: Nikita Kiryanov <nikita@compulab.co.il>
Date: Mon, 26 Nov 2012 23:06:32 +0000 (+0000)
Subject: gpio: remove duplicate function signature
X-Git-Tag: v2013.01-rc2~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94740e473920f5f0c71f949281db8dcb132e27cd;p=oweals%2Fu-boot.git

gpio: remove duplicate function signature

gpio_request() appears twice in asm-generic/gpio.h
Remove one of the definitions.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---

diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 23c9649403..bfedbe4459 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -42,10 +42,11 @@
  */
 
 /**
- * Request ownership of a GPIO.
+ * Request a gpio. This should be called before any of the other functions
+ * are used on this gpio.
  *
- * @param gpio	GPIO number
- * @param label	Name given to the GPIO
+ * @param gp	GPIO number
+ * @param label	User label for this GPIO
  * @return 0 if ok, -1 on error
  */
 int gpio_request(unsigned gpio, const char *label);
@@ -93,14 +94,4 @@ int gpio_get_value(unsigned gpio);
  * @return 0 if ok, -1 on error
  */
 int gpio_set_value(unsigned gpio, int value);
-
-/**
- * Request a gpio. This should be called before any of the other functions
- * are used on this gpio.
- *
- * @param gp	GPIO number
- * @param label	User label for this GPIO
- * @return 0 if ok, -1 on error
- */
-int gpio_request(unsigned gpio, const char *label);
 #endif	/* _ASM_GENERIC_GPIO_H_ */