git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
omap
/
Kconfig
diff --git
a/sound/soc/omap/Kconfig
b/sound/soc/omap/Kconfig
index a7b1d77b2105ec6e722e11301b822fe270c30e60..4f7f040145850b2e0d86a76aaa95657baa2b6d48 100644
(file)
--- a/
sound/soc/omap/Kconfig
+++ b/
sound/soc/omap/Kconfig
@@
-10,6
+10,7
@@
config SND_OMAP_SOC_N810
tristate "SoC Audio support for Nokia N810"
depends on SND_OMAP_SOC && MACH_NOKIA_N810
select SND_OMAP_SOC_MCBSP
+ select OMAP_MUX
select SND_SOC_TLV320AIC3X
help
Say Y if you want to add support for SoC audio on Nokia N810.