diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:25 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:25 +0800 |
commit | 137b939337b44c446e31414d5782e16006fb256c (patch) | |
tree | 017e337a7d4922628fedc683b050c5d3714a194f /arch/arm/Kconfig | |
parent | aede9c200012ac488f5973ff6edca1392a254914 (diff) | |
parent | 441386c9d8d142c903361360065cbbe2fbe57a6b (diff) |
Merge topic branch 'gpio' into integration-linux-ux500
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 275ac0dd1e8..2e1b250151a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1615,7 +1615,7 @@ config LOCAL_TIMERS config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA - default 355 if ARCH_U8500 + default 366 if ARCH_U8500 default 264 if MACH_H4700 default 0 help |