projects
/
linux-2.6-microblaze.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/wm8753' and 'asoc/topic/wm8985' into asoc...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
codecs
/
Kconfig
diff --git
a/sound/soc/codecs/Kconfig
b/sound/soc/codecs/Kconfig
index
d54604f
..
1cd6ab3
100644
(file)
--- a/
sound/soc/codecs/Kconfig
+++ b/
sound/soc/codecs/Kconfig
@@
-1002,7
+1002,8
@@
config SND_SOC_WM8983
tristate
config SND_SOC_WM8985
- tristate
+ tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
+ depends on SND_SOC_I2C_AND_SPI
config SND_SOC_WM8988
tristate