From: Olof Johansson <olof@lixom.net>
Date: Wed, 3 Apr 2013 01:33:58 +0000 (-0700)
Subject: Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc
X-Git-Tag: upstream/snapshot3+hdmi~5221^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06b851e58b73a268f8092c2d990f697b2e7c53bd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc

* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
  ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
  ARM: LPC32xx: defconfig update: Remove the museum NAND option
  ARM: LPC32xx: defconfig update: Default drivers and cleanup
  ARM: LPC32xx: defconfig update: gpio and keys
  + Linux 3.9-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/Kconfig
---

06b851e58b73a268f8092c2d990f697b2e7c53bd
diff --cc arch/arm/Kconfig
index 8b53e77,13b7394..1e8742b
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1660,10 -1659,10 +1659,10 @@@ config LOCAL_TIMER
  config ARCH_NR_GPIO
  	int
  	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
- 	default 392 if ARCH_U8500
- 	default 264 if MACH_H4700
  	default 512 if SOC_OMAP5
 -	default 355 if ARCH_U8500
++	default 392 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.