From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 28 Oct 2012 18:09:46 +0000 (+0000)
Subject: Merge branches 'fix/omap', 'fix/ux500', 'fix/wm8994', 'topic/ak4104', 'topic/arizona... 
X-Git-Tag: next-20121030~60^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10034701a4a9ebc3c7ad7cb2792fc8e99d8707de;p=karo-tx-linux.git

Merge branches 'fix/omap', 'fix/ux500', 'fix/wm8994', 'topic/ak4104', 'topic/arizona', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next
---

10034701a4a9ebc3c7ad7cb2792fc8e99d8707de
diff --cc sound/soc/codecs/Kconfig
index b92759a39361,b92759a39361,b92759a39361,b92759a39361,80799639814e,b92759a39361,b92759a39361,b92759a39361,b92759a39361,b92759a39361,b92759a39361,b92759a39361,7015db265614,b92759a39361,6f4f2845f856,f866e18e7876,b92759a39361,b92759a39361,b92759a39361,b92759a39361..0e368d469764
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@@@@@@@@@@@@@@@@ -146,6 -146,6 -146,6 -146,6 -146,13 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -146,6 -147,6 -146,11 -146,6 -146,6 -146,6 -146,6 +147,13 @@@@@@@@@@@@@@@@@@@@@ config SND_SOC_WM_HUB
                    	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_WM_ADSP
++++ ++++++++++ ++++	tristate
++++ +++++++++++++++	default y if SND_SOC_WM5102=y
++++ ++++++++++ ++++	default y if SND_SOC_WM2200=y
++++ +++++++++++++++	default m if SND_SOC_WM5102=m
++++ ++++++++++ ++++	default m if SND_SOC_WM2200=m
++++ ++++++++++ ++++
                    config SND_SOC_AB8500_CODEC
                    	tristate