aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2012-11-26 23:06:32 +0000
committerTom Rini <trini@ti.com>2012-12-11 13:17:32 -0700
commit94740e473920f5f0c71f949281db8dcb132e27cd (patch)
tree33080fcc9673cceb7825219f6011abd85461955a
parentd40d914c06e73c2a7823c2a6dd164d1c10529f84 (diff)
downloadu-boot-linaro-stable-94740e473920f5f0c71f949281db8dcb132e27cd.tar.gz
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>
-rw-r--r--include/asm-generic/gpio.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index 23c964940..bfedbe445 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_ */