Merge branch 'kvm-updates/3.4' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[~andy/linux] / arch / arm / mach-tegra / Kconfig

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index d2cb4b037f7f35a8e8c2c2ea86b8b12dcdf40210..d0f2546706ca1b53d6cae8d3eecb84dc89f79a17 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -7,8 +7,10 @@ config ARCH_TEGRA_2x_SOC
        select CPU_V7
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
+       select PINCTRL
+       select PINCTRL_TEGRA20
        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-       select USB_ULPI if USB_SUPPORT
+       select USB_ULPI if USB
        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select ARM_ERRATA_720789
        select ARM_ERRATA_742230
@@ -27,8 +29,10 @@ config ARCH_TEGRA_3x_SOC
        select CPU_V7
        select ARM_GIC
        select ARCH_REQUIRE_GPIOLIB
+       select PINCTRL
+       select PINCTRL_TEGRA30
        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-       select USB_ULPI if USB_SUPPORT
+       select USB_ULPI if USB
        select USB_ULPI_VIEWPORT if USB_SUPPORT
        select USE_OF
        select ARM_ERRATA_743622