Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

sound/soc/codecs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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