Merge branch 'tegra/t114' into next/soc
authorOlof Johansson <olof@lixom.net>
Sun, 10 Feb 2013 01:52:44 +0000 (17:52 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 10 Feb 2013 01:53:02 +0000 (17:53 -0800)
commitf58cf70ed954c179825cd0c51f5f64cd1ed74ed3
treef46e6fd10e45bd7d4e25c6ba93f145e281b9f557
parente2efc25ac21ff3c8ead9670dffba40926aa54ad7
parent1d7e5c2c815dda6eb7a0e41a6b27ea61cd927f99
Merge branch 'tegra/t114' into next/soc

Add a couple of fixes sent via email (via Stephen/Hiroshi).

* tegra/t114:
  ARM: tegra: sort Kconfig selects for Tegra114
  ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
  ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig
arch/arm/mach-tegra/board-dt-tegra114.c
arch/arm/mach-tegra/common.c