diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
commit | 6439e5c2a784f6b00dd136df54d6f0859bc77af3 (patch) | |
tree | f9dee1f0bdcf07eb7ce86dfbf9f1a558bae62404 /sound/soc/Kconfig | |
parent | 7c9c29eefa8ba503a34bac4ca4fb27083b78b726 (diff) | |
parent | 6f0c42269f000b1e346c84d9a589f17aa94c96d8 (diff) | |
download | talos-obmc-linux-6439e5c2a784f6b00dd136df54d6f0859bc77af3.tar.gz talos-obmc-linux-6439e5c2a784f6b00dd136df54d6f0859bc77af3.zip |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/Kconfig')
-rw-r--r-- | sound/soc/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 7de792b06007..7ff7d88e46dd 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -9,7 +9,6 @@ menuconfig SND_SOC select SND_JACK if INPUT=y || INPUT=SND select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER - select SND_COMPRESS_OFFLOAD ---help--- If you want ASoC support, you should say Y here and also to the @@ -30,6 +29,10 @@ config SND_SOC_GENERIC_DMAENGINE_PCM bool select SND_DMAENGINE_PCM +config SND_SOC_COMPRESS + bool + select SND_COMPRESS_OFFLOAD + config SND_SOC_TOPOLOGY bool |