diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:14 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:14 +0200 |
| commit | 1f1573eb976d678f587b6254b5257ee7edf6ffb3 (patch) | |
| tree | 3c6fe436798031ab21297c838c538b0b63017ad0 /arch/arm/Kconfig | |
| parent | 080a0882a84b5d9456ec6b4fb22ab38f598f795e (diff) | |
| parent | 17e9768f000fe1cb0020bb61d74d75c5faf7bb22 (diff) | |
Merge topic branch 'mach-plat' into integration-linux-ux500-3.3
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 58ad0515e3a..46ad3ebd89b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1583,7 +1583,7 @@ config LOCAL_TIMERS config ARCH_NR_GPIO int default 1024 if ARCH_SHMOBILE || ARCH_TEGRA - default 350 if ARCH_U8500 + default 355 if ARCH_U8500 default 0 help Maximum number of GPIOs in the system. |