aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx3/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer2010-01-14 10:58:10 +0100
committerSascha Hauer2010-01-14 10:58:10 +0100
commit37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e (patch)
treecd6d6433f1c80475f36b94b7432923b4d4b7b660 /arch/arm/mach-mx3/Kconfig
parentbecc670a1bda8f240a93e45d9794f9f79713ffdb (diff)
parenta8dfb6462a033984b99fee4122fe0799a31f5bb4 (diff)
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx3/Kconfig')
-rw-r--r--arch/arm/mach-mx3/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index ea8ed109a7c2..28294416b0af 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -49,6 +49,7 @@ config MACH_PCM037_EET
config MACH_MX31LITE
bool "Support MX31 LITEKIT (LogicPD)"
select ARCH_MX31
+ select MXC_ULPI if USB_ULPI
help
Include support for MX31 LITEKIT platform. This includes specific
configurations for the board and its peripherals.
@@ -63,7 +64,7 @@ config MACH_MX31_3DS
config MACH_MX31MOBOARD
bool "Support mx31moboard platforms (EPFL Mobots group)"
select ARCH_MX31
- select MXC_ULPI
+ select MXC_ULPI if USB_ULPI
help
Include support for mx31moboard platform. This includes specific
configurations for the board and its peripherals.