Messages in this thread | | | Date | Tue, 7 Apr 2015 19:28:08 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the slave-dma tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/dma/Kconfig between commit ad80da658bbc ("dmaengine: Driver support for FSL RaidEngine device") from the slave-dma tree and commit 2b49e0c56741 ("dmaengine: append hsu DMA driver") from the tty tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/dma/Kconfig index 38ece743f61d,074ffad334a7..000000000000 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@@ -112,17 -125,8 +112,19 @@@ config FSL_DM EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on some Txxx and Bxxx parts. +config FSL_RAID + tristate "Freescale RAID engine Support" + depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH + select DMA_ENGINE + select DMA_ENGINE_RAID + ---help--- + Enable support for Freescale RAID Engine. RAID Engine is + available on some QorIQ SoCs (like P5020/P5040). It has + the capability to offload memcpy, xor and pq computation + for raid5/6. + + source "drivers/dma/hsu/Kconfig" + config MPC512X_DMA tristate "Freescale MPC512x built-in DMA engine support" depends on PPC_MPC512x || PPC_MPC831x [unhandled content-type:application/pgp-signature] | |