diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 15:38:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-05-16 15:38:29 +1000 |
| commit | fc732f1b9d381a0502133d9f7ba5f50d1b851bfa (patch) | |
| tree | 13f276ab6f7a5d28b57cf20cd5a53a4ed718d884 /arch | |
| parent | a0a5f47cfe4f1906f82bd930f39134a59f2fe345 (diff) | |
| parent | 565bea2abdf7c8a754b7ce11f11c10b1cbf517a6 (diff) | |
Merge remote-tracking branch 'pinctrl/for-next'
Diffstat (limited to 'arch')
| -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 211b51187e62..3f42ea8dbaea 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1647,9 +1647,9 @@ config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX + default 416 if ARCH_SUNXI default 392 if ARCH_U8500 default 352 if ARCH_VT8500 - default 288 if ARCH_SUNXI default 264 if MACH_H4700 default 0 help |