summaryrefslogtreecommitdiffstats
path: root/drivers/dma/Makefile
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2017-11-14 10:36:09 +0530
committerVinod Koul <vinod.koul@intel.com>2017-11-14 10:36:09 +0530
commit135ab7f53cfb77bd0b215b68eed006c7825ea01e (patch)
tree64ecce9f31a7b88f16851d9deaf04af0d8611205 /drivers/dma/Makefile
parent9c6027133626efd773fa84478c5d8c9209df41f6 (diff)
parent9b3b8171f7f4ecbbc28f3c1ae60462826a5d9072 (diff)
downloadlinux-135ab7f53cfb77bd0b215b68eed006c7825ea01e.tar.bz2
Merge branch 'topic/sprd' into for-linus
Kconfig and Makefile conflicts so put them in right order (sprd ones after stm ones) Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/Makefile')
-rw-r--r--drivers/dma/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 4d2376fdea01..774546e89a40 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
obj-$(CONFIG_STM32_DMA) += stm32-dma.o
obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
+obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o