diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:47 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:47 +0000 |
commit | 43b64af5350119e2e4f0a1423caceab4bd40dd73 (patch) | |
tree | f63b372d06f373392af1fa8ace605edf4d27be23 /sound/soc/sh/Kconfig | |
parent | 52708d05bad11ea2cd2c1391af13321b80982332 (diff) | |
parent | b99258a3151a70da9b4125f940c4dcc091df84c1 (diff) | |
download | op-kernel-dev-43b64af5350119e2e4f0a1423caceab4bd40dd73.zip op-kernel-dev-43b64af5350119e2e4f0a1423caceab4bd40dd73.tar.gz |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc/sh/Kconfig')
-rw-r--r-- | sound/soc/sh/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 6db6405..147ebec 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -1,5 +1,5 @@ menu "SoC Audio support for SuperH" - depends on SUPERH || ARCH_SHMOBILE + depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST config SND_SOC_PCM_SH7760 tristate "SoC Audio support for Renesas SH7760" @@ -37,6 +37,7 @@ config SND_SOC_SH4_SIU config SND_SOC_RCAR tristate "R-Car series SRU/SCU/SSIU/SSI support" depends on COMMON_CLK + depends on OF || COMPILE_TEST select SND_SIMPLE_CARD select REGMAP_MMIO help |