Messages in this thread Patch in this message | | | Date | Tue, 27 May 2008 18:20:29 +0400 | From | Anton Vorontsov <> | Subject | [PATCH] gpio: fix build errors for drivers not strictly requiring GPIOs |
| |
Since commit 7560fa60fcdcdb0da662f6a9fad9064b554ef46c (gpio: <linux/gpio.h> and "no GPIO support here" stubs) drivers can use GPIOs if they're available, but don't require them.
This patch actually enables this feature, otherwise drivers will stumble against this:
include/asm-generic/gpio.h:111: error: redefinition of 'gpio_is_valid' include/linux/gpio.h:21: error: previous definition of 'gpio_is_valid' was here include/asm-generic/gpio.h:121: error: redefinition of 'gpio_cansleep' include/linux/gpio.h:60: error: previous definition of 'gpio_cansleep' was here include/asm-generic/gpio.h:126: error: redefinition of 'gpio_get_value_cansleep' include/linux/gpio.h:67: error: previous definition of 'gpio_get_value_cansleep' was here include/asm-generic/gpio.h:132: error: redefinition of 'gpio_set_value_cansleep' include/linux/gpio.h:74: error: previous definition of 'gpio_set_value_cansleep' was here
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> --- include/asm-generic/gpio.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 9c03b71..c9bcbd6 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -105,7 +105,7 @@ extern void __gpio_set_value(unsigned gpio, int value); extern int __gpio_cansleep(unsigned gpio); -#else +#elif defined(CONFIG_GENERIC_GPIO) static inline int gpio_is_valid(int number) { -- 1.5.5.1
| |