projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...
[linux-2.6-block.git]
/
sound
/
soc
/
codecs
/
Kconfig
diff --git
a/sound/soc/codecs/Kconfig
b/sound/soc/codecs/Kconfig
index 6ecac1e4428eafc491d6cfc25110f6b3dbf699ed..1471fad19cfa6d2534a9d382b34a52e10d76028a 100644
(file)
--- a/
sound/soc/codecs/Kconfig
+++ b/
sound/soc/codecs/Kconfig
@@
-529,7
+529,7
@@
config SND_SOC_RT5677
config SND_SOC_RT5677_SPI
tristate
- default SND_SOC_RT5677
+ default SND_SOC_RT5677
&& SPI
#Freescale sgtl5000 codec
config SND_SOC_SGTL5000