diff options
author | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
tree | 3775742e873f18d005fd8c2187411ead06c0049d /drivers/dma/sh/Kconfig | |
parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
download | lwn-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.gz lwn-b53c7582805b10d6a32e88e22d16dc469e66a37a.zip |
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 help Enable support for the Renesas R-Car series DMA controllers. -config RCAR_AUDMAC_PP - tristate "Renesas R-Car Audio DMAC Peripheral Peripheral support" - depends on SH_DMAE_BASE - help - Enable support for the Renesas R-Car Audio DMAC Peripheral Peripheral controllers. - config RCAR_DMAC tristate "Renesas R-Car Gen2 DMA Controller" depends on ARCH_SHMOBILE || COMPILE_TEST |