diff options
| author | Vinod Koul | 2015-02-03 01:55:43 +0100 |
|---|---|---|
| committer | Vinod Koul | 2015-02-03 01:55:43 +0100 |
| commit | 46c2eb645991c00bcbdf991c2f74389f7efce918 (patch) | |
| tree | 874cd6c0e0c72238b966cb08135e5af9e9b1c936 /drivers/dma/sh/Makefile | |
| parent | Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-linus (diff) | |
| parent | dmaengine: rcar-dmac: Handle hardware descriptor allocation failure (diff) | |
| download | kernel-qcow2-linux-46c2eb645991c00bcbdf991c2f74389f7efce918.tar.gz kernel-qcow2-linux-46c2eb645991c00bcbdf991c2f74389f7efce918.tar.xz kernel-qcow2-linux-46c2eb645991c00bcbdf991c2f74389f7efce918.zip | |
Merge branch 'topic/rcar' into for-linus
Diffstat (limited to 'drivers/dma/sh/Makefile')
| -rw-r--r-- | drivers/dma/sh/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index 0a5cfdb76e45..2852f9db61a4 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -16,3 +16,4 @@ obj-$(CONFIG_SH_DMAE) += shdma.o obj-$(CONFIG_SUDMAC) += sudmac.o obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o obj-$(CONFIG_RCAR_AUDMAC_PP) += rcar-audmapp.o +obj-$(CONFIG_RCAR_DMAC) += rcar-dmac.o |