Skip to content
Snippets Groups Projects
Commit 3b89b223 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.35' into for-2.6.36

parents a3257ba8 41f9a314
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
sound/soc/codecs/Kconfig
+ 2
− 2
View file @ 3b89b223
......@@ -85,8 +85,8 @@ config SND_SOC_ALL_CODECS
config SND_SOC_WM_HUBS
tristate
default y if SND_SOC_WM8993=y
default m if SND_SOC_WM8993=m
default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
config SND_SOC_AC97_CODEC
tristate
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment