From 9a08a1ce8c251987a10d40f47bc330ec907e0d0d Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 1 Feb 2012 14:04:48 -0700 Subject: [PATCH] --- yaml --- r: 294099 b: refs/heads/master c: f1f1ffa0d2fd562b610940c7374b8217597af47f h: refs/heads/master i: 294097: 4bd3301d2570be62a2053cae1e6082055e23f070 294095: 85850e94c1b42b7ff8e2e8361bd538a4628c1939 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3fa63b1ae2a..dab5cabd9759 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 971dac7123c785fdb0d09276b5d459b67585e242 +refs/heads/master: f1f1ffa0d2fd562b610940c7374b8217597af47f diff --git a/trunk/arch/arm/mach-tegra/Kconfig b/trunk/arch/arm/mach-tegra/Kconfig index 373652d76b90..32b420a90c3d 100644 --- a/trunk/arch/arm/mach-tegra/Kconfig +++ b/trunk/arch/arm/mach-tegra/Kconfig @@ -7,6 +7,8 @@ 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_VIEWPORT if USB_SUPPORT @@ -19,6 +21,8 @@ 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_VIEWPORT if USB_SUPPORT