summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann2012-03-02 23:26:00 +0100
committerOlof Johansson2012-03-18 18:34:32 +0100
commit279b658525abd06645938fb607860de42c4cf31e (patch)
treeb7d6926626939b7fdb1c0a1eed7309d7c901b69c /arch
parentarm/tegra: pcie: fix return value of function (diff)
downloadkernel-qcow2-linux-279b658525abd06645938fb607860de42c4cf31e.tar.gz
kernel-qcow2-linux-279b658525abd06645938fb607860de42c4cf31e.tar.xz
kernel-qcow2-linux-279b658525abd06645938fb607860de42c4cf31e.zip
ARM: tegra: select USB_ULPI if USB is selected
Automatically select USB_ULPI if USB is enabled on Tegra. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Alan Ott <alan@signal11.us> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index d2cb4b037f7f..6ae78821fd8e 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -8,7 +8,7 @@ config ARCH_TEGRA_2x_SOC
select ARM_GIC
select ARCH_REQUIRE_GPIOLIB
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
@@ -28,7 +28,7 @@ config ARCH_TEGRA_3x_SOC
select ARM_GIC
select ARCH_REQUIRE_GPIOLIB
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