diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:12:35 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:12:35 -0400 |
| commit | 265d9c673d47fcd5812d69dc07104b706285de56 (patch) | |
| tree | ebb686a2ecbf702c4a5cab975cf86fbc10dac5e7 /drivers/dma/sh/Kconfig | |
| parent | 592745e2f8afbaeafcf72645f0a2b0285644e091 (diff) | |
| parent | e5ffa401eacd0e74178e20ba932200fc9fe41c07 (diff) | |
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/Kconfig')
| -rw-r--r-- | drivers/dma/sh/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig index e2b94d16f41f..dadd9e010c0b 100644 --- a/drivers/dma/sh/Kconfig +++ b/drivers/dma/sh/Kconfig | |||
| @@ -28,3 +28,7 @@ config RCAR_HPB_DMAE | |||
| 28 | depends on SH_DMAE_BASE | 28 | depends on SH_DMAE_BASE |
| 29 | help | 29 | help |
| 30 | Enable support for the Renesas R-Car series DMA controllers. | 30 | Enable support for the Renesas R-Car series DMA controllers. |
| 31 | |||
| 32 | config SHDMA_R8A73A4 | ||
| 33 | def_bool y | ||
| 34 | depends on ARCH_R8A73A4 && SH_DMAE != n | ||