diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 08:04:56 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-11-14 08:04:56 +0300 |
| commit | 9c6027133626efd773fa84478c5d8c9209df41f6 (patch) | |
| tree | 33974ace800bee72c96cf32b05aaa019034728af /drivers/dma/Makefile | |
| parent | 2c8528592c3280c3e2dc85a804120ca64137de32 (diff) | |
| parent | d83f4131c2e06ef93cd3d6d44bb3475728790ab6 (diff) | |
| download | linux-9c6027133626efd773fa84478c5d8c9209df41f6.tar.xz | |
Merge branch 'topic/stm' into for-linus
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index f08f8de1b567..4d2376fdea01 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -59,6 +59,8 @@ obj-$(CONFIG_RENESAS_DMA) += sh/ obj-$(CONFIG_SIRF_DMA) += sirf-dma.o 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_S3C24XX_DMAC) += s3c24xx-dma.o obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o |