diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-10-31 07:37:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-31 07:37:05 +0530 |
| commit | 3638691c64728bad2714a7d4908516997319c481 (patch) | |
| tree | a28b97b74af872e4cf5ed2ab2e004848e9252ab5 /drivers/dma/Kconfig | |
| parent | 7d9d43ace29be375d3d1654b688b94029308a1be (diff) | |
| parent | 97c37accd38f6136fa0abbdef01b5f864e91e6c7 (diff) | |
Merge branch 'topic/idma' into for-linus
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 6a388a7c6429..e6cd1a32025a 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -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 |