diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/arm/mach-mx3/Kconfig | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'arch/arm/mach-mx3/Kconfig')
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index 28294416b0a..3872af1cf2c 100644 --- a/arch/arm/mach-mx3/Kconfig +++ b/arch/arm/mach-mx3/Kconfig | |||
| @@ -34,6 +34,7 @@ config MACH_MX31ADS_WM1133_EV1 | |||
| 34 | config MACH_PCM037 | 34 | config MACH_PCM037 |
| 35 | bool "Support Phytec pcm037 (i.MX31) platforms" | 35 | bool "Support Phytec pcm037 (i.MX31) platforms" |
| 36 | select ARCH_MX31 | 36 | select ARCH_MX31 |
| 37 | select MXC_ULPI if USB_ULPI | ||
| 37 | help | 38 | help |
| 38 | Include support for Phytec pcm037 platform. This includes | 39 | Include support for Phytec pcm037 platform. This includes |
| 39 | specific configurations for the board and its peripherals. | 40 | specific configurations for the board and its peripherals. |
| @@ -86,6 +87,7 @@ config MACH_QONG | |||
| 86 | config MACH_PCM043 | 87 | config MACH_PCM043 |
| 87 | bool "Support Phytec pcm043 (i.MX35) platforms" | 88 | bool "Support Phytec pcm043 (i.MX35) platforms" |
| 88 | select ARCH_MX35 | 89 | select ARCH_MX35 |
| 90 | select MXC_ULPI if USB_ULPI | ||
| 89 | help | 91 | help |
| 90 | Include support for Phytec pcm043 platform. This includes | 92 | Include support for Phytec pcm043 platform. This includes |
| 91 | specific configurations for the board and its peripherals. | 93 | specific configurations for the board and its peripherals. |