diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-06-25 09:21:58 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-06-25 09:21:58 +0530 |
| commit | f2704052cb42aabfa19b3f897cbceb70e2e63c45 (patch) | |
| tree | 441522897d4b6dcc2d5197d7711280214326f190 /drivers/dma/Makefile | |
| parent | 4fb9c15b4f2371b8640c411ceff2c100857aee2c (diff) | |
| parent | c91134d9194478144ba579ca6efeddf628055650 (diff) | |
| download | linux-f2704052cb42aabfa19b3f897cbceb70e2e63c45.tar.bz2 | |
Merge branch 'topic/pxa' into for-linus
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 535919559f12..6a4d6f2827da 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ obj-$(CONFIG_IMX_SDMA) += imx-sdma.o obj-$(CONFIG_IMX_DMA) += imx-dma.o obj-$(CONFIG_MXS_DMA) += mxs-dma.o +obj-$(CONFIG_PXA_DMA) += pxa_dma.o obj-$(CONFIG_TIMB_DMA) += timb_dma.o obj-$(CONFIG_SIRF_DMA) += sirf-dma.o obj-$(CONFIG_TI_EDMA) += edma.o |