diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:16 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:16 +0200 |
| commit | cc0477d1ff54e53b7d2b15bc52e33ef38921a295 (patch) | |
| tree | 47177b997291911df68dab553fd6ed36d5a19721 /arch/arm/Kconfig | |
| parent | 1f1573eb976d678f587b6254b5257ee7edf6ffb3 (diff) | |
| parent | 1133af78634d3bcfaf3af12eb208d906af36efb5 (diff) | |
Merge topic branch 'gpio' 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 46ad3ebd89b..9a4b9d580ab 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 355 if ARCH_U8500 + default 366 if ARCH_U8500 default 0 help Maximum number of GPIOs in the system. |