diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:05:22 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:05:22 +0800 |
| commit | 2c04041962c10d87afe28c834f52129a0d3f1d90 (patch) | |
| tree | 866e091ccb0c94509ce01b7b24986b7d164535b9 /drivers/dma/Makefile | |
| parent | 08dcfadc9a22bdb8cd37bc1ce38bc98d202cd857 (diff) | |
| parent | 3d64db930d8977efd451e1bb705ebb0fb1b9b757 (diff) | |
Merge branch 'pxp/next' into next
* pxp/next:
media: pxp device: fix kernel dump when run pxp_test
media: v4l2: add pxp_v4l2 driver
dma: pxp: porting pxp dma driver from imx_4.19.y
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 06c67aedc0c5..6c977c171706 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -60,6 +60,8 @@ obj-$(CONFIG_PCH_DMA) += pch_dma.o obj-$(CONFIG_PL330_DMA) += pl330.o obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_PXA_DMA) += pxa_dma.o +obj-$(CONFIG_MXC_PXP_V2) += pxp/ +obj-$(CONFIG_MXC_PXP_V3) += pxp/ obj-$(CONFIG_RENESAS_DMA) += sh/ obj-$(CONFIG_SIRF_DMA) += sirf-dma.o obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o |