diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-10-31 03:07:05 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-10-31 03:07:05 +0100 |
| commit | 3638691c64728bad2714a7d4908516997319c481 (patch) | |
| tree | a28b97b74af872e4cf5ed2ab2e004848e9252ab5 /drivers/dma/Makefile | |
| parent | Merge branch 'topic/edma' into for-linus (diff) | |
| parent | dmaengine: idma64: use lo_hi_readq() / lo_hi_writeq() (diff) | |
| download | linux-3638691c64728bad2714a7d4908516997319c481.tar.xz linux-3638691c64728bad2714a7d4908516997319c481.zip | |
Merge branch 'topic/idma' into for-linus
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 7711a7180726..ef9c099bd2b6 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_HSU_DMA) += hsu/ obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o obj-$(CONFIG_IMX_DMA) += imx-dma.o obj-$(CONFIG_IMX_SDMA) += imx-sdma.o -obj-$(CONFIG_IDMA64) += idma64.o +obj-$(CONFIG_INTEL_IDMA64) += idma64.o obj-$(CONFIG_INTEL_IOATDMA) += ioat/ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o |