diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 14:51:14 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-20 14:51:14 -0400 |
| commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
| tree | 3775742e873f18d005fd8c2187411ead06c0049d /drivers/dma/sh/Kconfig | |
| parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
| parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'drivers/dma/sh/Kconfig')
| -rw-r--r-- | drivers/dma/sh/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/dma/sh/Kconfig b/drivers/dma/sh/Kconfig index f6ca002cb7c5..0f371524a4d9 100644 --- a/drivers/dma/sh/Kconfig +++ b/drivers/dma/sh/Kconfig | |||
| @@ -51,12 +51,6 @@ config RCAR_HPB_DMAE | |||
| 51 | help | 51 | help |
| 52 | Enable support for the Renesas R-Car series DMA controllers. | 52 | Enable support for the Renesas R-Car series DMA controllers. |
| 53 | 53 | ||
| 54 | config RCAR_AUDMAC_PP | ||
| 55 | tristate "Renesas R-Car Audio DMAC Peripheral Peripheral support" | ||
| 56 | depends on SH_DMAE_BASE | ||
| 57 | help | ||
| 58 | Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers. | ||
| 59 | |||
| 60 | config RCAR_DMAC | 54 | config RCAR_DMAC |
| 61 | tristate "Renesas R-Car Gen2 DMA Controller" | 55 | tristate "Renesas R-Car Gen2 DMA Controller" |
| 62 | depends on ARCH_SHMOBILE || COMPILE_TEST | 56 | depends on ARCH_SHMOBILE || COMPILE_TEST |