| Message ID | 1455637261-2920972-5-git-send-email-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | aa6aedb547209391db75b2e4fdbce6b442fd5891 |
| Headers | show |
| Series | [v2,1/5] MIPS: jz4740: remove broken irq_to_gpio() call | expand |
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 40ec1433f05d..8ca627dcea11 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -26,8 +26,12 @@ */ #ifndef ARCH_NR_GPIOS +#if defined(CONFIG_ARCH_NR_GPIO) && CONFIG_ARCH_NR_GPIO > 0 +#define ARCH_NR_GPIOS CONFIG_ARCH_NR_GPIO +#else #define ARCH_NR_GPIOS 512 #endif +#endif /* * "valid" GPIO numbers are nonnegative and may be passed to
The ARM version of asm/gpio.h basically just contains the same definitions as the gpiolib version, with the exception of ARCH_NR_GPIOS. This adds the option for overriding the constant through Kconfig to the architecture-independent header, so we can remove the ARM specific file later. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/asm-generic/gpio.h | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.0