diff --git a/[refs] b/[refs]
index 49804a7a8d40..d84fbc8393a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35eb429875cedb6689ccd0c4d11cf219f07e0a9d
+refs/heads/master: 39f47d9f437fa94622bf51d7b18b42b3336ad9ac
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index a91009c61870..02fae9adafec 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1581,6 +1581,7 @@ config ARCH_NR_GPIO
 	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
 	default 355 if ARCH_U8500
 	default 264 if MACH_H4700
+	default 512 if SOC_OMAP5
 	default 0
 	help
 	  Maximum number of GPIOs in the system.