git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
Kconfig
diff --git
a/sound/soc/codecs/Kconfig
b/sound/soc/codecs/Kconfig
index
8079963
..
ef03c7a
100644
(file)
--- 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