From 932bd166935d5a53a59997f169c0b0d835a312e6 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Sun, 3 Feb 2013 12:24:48 +0100
Subject: [PATCH] --- yaml --- r: 361168 b: refs/heads/master c:
 2a6ad871a10ce915a300d8f227168ad4c34936ec h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 782889ec7c7a..b02a2f669b29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51c66cf9695f389126119e4cd7a50b832648f11e
+refs/heads/master: 2a6ad871a10ce915a300d8f227168ad4c34936ec
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 5b714695b01b..c7e027436f9e 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1657,13 +1657,16 @@ config LOCAL_TIMERS
 	  accounting to be spread across the timer interval, preventing a
 	  "thundering herd" at every timer tick.
 
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
 config ARCH_NR_GPIO
 	int
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-	default 355 if ARCH_U8500
-	default 264 if MACH_H4700
 	default 512 if SOC_OMAP5
+	default 355 if ARCH_U8500
 	default 288 if ARCH_VT8500 || ARCH_SUNXI
+	default 264 if MACH_H4700
 	default 0
 	help
 	  Maximum number of GPIOs in the system.