Merge branch 'topic/idma' into for-linus

This commit is contained in:
Vinod Koul
2015-10-31 07:37:05 +05:30
4 changed files with 19 additions and 21 deletions

View File

@@ -229,7 +229,7 @@ config IMX_SDMA
Support the i.MX SDMA engine. This engine is integrated into
Freescale i.MX25/31/35/51/53/6 chips.
config IDMA64
config INTEL_IDMA64
tristate "Intel integrated DMA 64-bit support"
select DMA_ENGINE
select DMA_VIRTUAL_CHANNELS