diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-02-08 14:26:49 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-02-08 14:26:49 +0100 |
| commit | 7ac63ac61d67703aba1add4a89c4de702068d2f2 (patch) | |
| tree | 977691d43adcaca42181b61ef34b6f90455f1187 /arch/arm/Kconfig | |
| parent | 879029c701fa6c9a46b9c80ebf8f5316c490cbfe (diff) | |
| parent | a0d72094f0abad3cbeeed618d24fd0ce1968d1a8 (diff) | |
Merge branch 'allwinner-sunxi' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67874b82a4ed..9c635b6cc3ea 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1637,7 +1637,7 @@ config ARCH_NR_GPIO default 355 if ARCH_U8500 default 264 if MACH_H4700 default 512 if SOC_OMAP5 - default 288 if ARCH_VT8500 + default 288 if ARCH_VT8500 || ARCH_SUNXI default 0 help Maximum number of GPIOs in the system. |