diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-09-03 12:13:29 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-09-03 12:13:29 +0400 |
| commit | 492d7e41076682ac7d67435d8b00a3e3989b8ea8 (patch) | |
| tree | ab11fe56e0ddc55477e0ff5788a50240565759fe /sound/soc/codecs/Kconfig | |
| parent | 9574d6b41b132d44338e70823a819204164af16d (diff) | |
| parent | 53cc21ea2c0bc23aaa82d9bb36490e661d765d93 (diff) | |
Merge branch 'tracking-samslt-all' into merge-linux-linaroll-20130903.0ll_20130903.0
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index badb6fbacaa6..58784ca32d90 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -246,6 +246,9 @@ config SND_SOC_CX20442 tristate depends on TTY +config SND_SOC_I2S_STUB + tristate + config SND_SOC_JZ4740_CODEC select REGMAP_MMIO tristate |