diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
| commit | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (patch) | |
| tree | 02de8c3503c1c811754423d2fa3f3b4978044f6e /arch/arm/mach-mx3/Kconfig | |
| parent | 9ff99339447de403a46be5e3f23d0c794d540b06 (diff) | |
| parent | 91e013827c0bcbb187ecf02213c5446b6f62d445 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
ARM: S3C2443: Remove #if 0 for clk_mpll
ARM: S3C2443: Update notes on MPLLREF clock
ARM: S3C2443: Further clksrc-clk conversions
ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
USB: Fix s3c-hsotg build following Samsung platform header moves
ARM: S3C64XX: Reintroduce unconditional build of audio device
ARM: 5961/1: ux500: fix CLKRST addresses
ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
ASoC: Fix S3C64xx IIS driver for Samsung header reorg
ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
[ARM] pxa: fix typo in mxm8x10.h
[ARM] pxa/raumfeld: set GPIO drive bits for LED pins
[ARM] pxa/zeus: Add support for mcp2515 CAN bus
[ARM] pxa/zeus: Add support for onboard max6369 watchdog
[ARM] pxa/zeus: Add Eurotech as the manufacturer
[ARM] pxa/zeus: Correct the USB host initialisation flags
[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
[ARM] pxa: refactor uncompress.h for non-PXA uarts
[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
...
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 28294416b0af..3872af1cf2c3 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. |