diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:25:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:25:41 +0100 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-shmobile/include/mach/gpio.h | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
| download | talos-obmc-linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.tar.gz talos-obmc-linux-3e965b176341b78620f7404fd8b7f9a0d061f8a2.zip | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/gpio.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h index 2b1bb9e43dda..7bf0890e16ba 100644 --- a/arch/arm/mach-shmobile/include/mach/gpio.h +++ b/arch/arm/mach-shmobile/include/mach/gpio.h @@ -18,31 +18,15 @@ #ifdef CONFIG_GPIOLIB -static inline int gpio_get_value(unsigned gpio) -{ - return __gpio_get_value(gpio); -} - -static inline void gpio_set_value(unsigned gpio, int value) -{ - __gpio_set_value(gpio, value); -} - -static inline int gpio_cansleep(unsigned gpio) -{ - return __gpio_cansleep(gpio); -} - -static inline int gpio_to_irq(unsigned gpio) -{ - return __gpio_to_irq(gpio); -} - static inline int irq_to_gpio(unsigned int irq) { return -ENOSYS; } +#else + +#define __ARM_GPIOLIB_COMPLEX + #endif /* CONFIG_GPIOLIB */ #endif /* __ASM_ARCH_GPIO_H */ |
