diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:12 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:12 -0500 |
| commit | 18620cc58683daacaa23d32e13eb4c27892137f6 (patch) | |
| tree | 04c8dee33e345eb2428c56b82141190ff78b45df /sound/soc/codecs/Kconfig | |
| parent | 2766ee82b28947b1411363e6cc471e1338090e99 (diff) | |
| parent | dd1b18abca8aabaa464e4d9418752a45c90ccd69 (diff) | |
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 80799639814e..ef03c7ab46a6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -236,6 +236,7 @@ config SND_SOC_CX20442 | |||
| 236 | tristate | 236 | tristate |
| 237 | 237 | ||
| 238 | config SND_SOC_JZ4740_CODEC | 238 | config SND_SOC_JZ4740_CODEC |
| 239 | select REGMAP_MMIO | ||
| 239 | tristate | 240 | tristate |
| 240 | 241 | ||
| 241 | config SND_SOC_L3 | 242 | config SND_SOC_L3 |