diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:12 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:12 +0900 |
commit | 18620cc58683daacaa23d32e13eb4c27892137f6 (patch) | |
tree | 04c8dee33e345eb2428c56b82141190ff78b45df /sound/soc/codecs/Kconfig | |
parent | 2766ee82b28947b1411363e6cc471e1338090e99 (diff) | |
parent | dd1b18abca8aabaa464e4d9418752a45c90ccd69 (diff) | |
download | op-kernel-dev-18620cc58683daacaa23d32e13eb4c27892137f6.zip op-kernel-dev-18620cc58683daacaa23d32e13eb4c27892137f6.tar.gz |
Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r-- | sound/soc/codecs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 8079963..ef03c7a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -236,6 +236,7 @@ config SND_SOC_CX20442 tristate config SND_SOC_JZ4740_CODEC + select REGMAP_MMIO tristate config SND_SOC_L3 |