diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-05-15 16:44:05 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-05-15 16:44:05 +0200 |
| commit | 768d4af538e6d1fbc3f3342d6179427fa3e22bfe (patch) | |
| tree | 88b33e595162cfcc6e337a3ded520d5134da5592 /arch/arm/mach-mvf/board-twr-vf700.c | |
| parent | a0b49113b02cf13c3d5079f7f6ae1fcf63c9a953 (diff) | |
| parent | b2faeb5472fe71b505a103388b8a8540dbd47134 (diff) | |
Merge tag '3.0-vybrid-ts2.16' into colibri_vfColibri_VF_LinuxImageV2.2Beta1_20140603
3.0-vybrid-ts2.16
Conflicts:
drivers/tty/serial/mvf.c
Diffstat (limited to 'arch/arm/mach-mvf/board-twr-vf700.c')
| -rw-r--r-- | arch/arm/mach-mvf/board-twr-vf700.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvf/board-twr-vf700.c b/arch/arm/mach-mvf/board-twr-vf700.c index 3c19b1c70ec9..576233588dde 100644 --- a/arch/arm/mach-mvf/board-twr-vf700.c +++ b/arch/arm/mach-mvf/board-twr-vf700.c @@ -249,13 +249,13 @@ static struct platform_device mvf_twr_audio_device = { }; static struct imxuart_platform_data mvf_uart1_pdata = { - .flags = IMXUART_FIFO | IMXUART_EDMA, + .flags = IMXUART_FIFO, .dma_req_rx = DMA_MUX03_UART1_RX, .dma_req_tx = DMA_MUX03_UART1_TX, }; static struct imxuart_platform_data mvf_uart0_pdata = { - .flags = IMXUART_FIFO | IMXUART_EDMA, + .flags = IMXUART_FIFO, .dma_req_rx = DMA_MUX03_UART0_RX, .dma_req_tx = DMA_MUX03_UART0_TX, }; |