From: Mark Brown <broonie@kernel.org>
Date: Sun, 12 Apr 2015 18:49:06 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc... 
X-Git-Tag: v4.1-rc1~16^2~14^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1f059937a2b90a1dbf314959776d3f51b4ab20d;p=platform%2Fkernel%2Flinux-exynos.git

Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next
---

e1f059937a2b90a1dbf314959776d3f51b4ab20d
diff --cc sound/soc/codecs/Kconfig
index 0bddd92,064e6c1,064e6c1,0ccce5a,064e6c1..061c465
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -69,7 -69,7 -69,7 -69,8 -69,7 +69,8 @@@@@@ config SND_SOC_ALL_CODEC
     	select SND_SOC_MAX98088 if I2C
     	select SND_SOC_MAX98090 if I2C
     	select SND_SOC_MAX98095 if I2C
 -- -	select SND_SOC_MAX98357A
 ++ +	select SND_SOC_MAX98357A if GPIOLIB
+++ +	select SND_SOC_MAX98925 if I2C
     	select SND_SOC_MAX9850 if I2C
     	select SND_SOC_MAX9768 if I2C
     	select SND_SOC_MAX9877 if I2C