diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:07 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 13:35:07 +0900 |
commit | 81e2c0da114fc6ed41147b6559a530cd21708e81 (patch) | |
tree | 02aba78036c869ccd49bc03725a7e2f128b5c738 /sound/soc/codecs/Kconfig | |
parent | 81467c332579df104c2f863aca48d5390b9079cd (diff) | |
parent | dd1b18abca8aabaa464e4d9418752a45c90ccd69 (diff) | |
download | kernel_goldelico_gta04-81e2c0da114fc6ed41147b6559a530cd21708e81.zip kernel_goldelico_gta04-81e2c0da114fc6ed41147b6559a530cd21708e81.tar.gz kernel_goldelico_gta04-81e2c0da114fc6ed41147b6559a530cd21708e81.tar.bz2 |
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 |