diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 16:12:35 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 16:12:35 +0400 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /drivers/dma/sh/Makefile | |
| parent | 592745e2f8afbaeafcf72645f0a2b0285644e091 (diff) | |
| parent | e5ffa401eacd0e74178e20ba932200fc9fe41c07 (diff) | |
| download | linux-265d9c673d47fcd5812d69dc07104b706285de56.tar.xz | |
Merge branch 'topic/sh' into for-linus
Conflicts:
drivers/dma/sh/Kconfig
drivers/dma/sh/shdmac.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh/Makefile')
| -rw-r--r-- | drivers/dma/sh/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dma/sh/Makefile b/drivers/dma/sh/Makefile index ccf17cb5af10..e856af23b789 100644 --- a/drivers/dma/sh/Makefile +++ b/drivers/dma/sh/Makefile @@ -1,4 +1,9 @@ obj-$(CONFIG_SH_DMAE_BASE) += shdma-base.o shdma-of.o obj-$(CONFIG_SH_DMAE) += shdma.o +shdma-y := shdmac.o +ifeq ($(CONFIG_OF),y) +shdma-$(CONFIG_SHDMA_R8A73A4) += shdma-r8a73a4.o +endif +shdma-objs := $(shdma-y) obj-$(CONFIG_SUDMAC) += sudmac.o obj-$(CONFIG_RCAR_HPB_DMAE) += rcar-hpbdma.o |