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

diff --cc arch/arm/Kconfig
index 8b53e77c9ef94eed231b0ad3c4912fd9af342d48,13b739469c515cb93a8dff1cdf686583a3941c54..1e8742b5f8399cd8c4efba636f6747bd20d8eff6
--- 1/arch/arm/Kconfig
--- 2/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.