From: Mark Brown <broonie@linaro.org>
Date: Sun, 23 Mar 2014 14:00:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/topic/cs42xx8' into asoc-next
X-Git-Tag: v3.15-rc1~36^2~1^2~3^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b4d032b3fbe444c7978eb5aeda5d24164a9e8c2e;p=~emulex%2Finfiniband.git

Merge remote-tracking branch 'asoc/topic/cs42xx8' into asoc-next
---

b4d032b3fbe444c7978eb5aeda5d24164a9e8c2e
diff --cc sound/soc/codecs/Kconfig
index 1a8ff1e541e,a79c0d141f9..f0e84013788
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -301,9 -253,17 +302,18 @@@ config SND_SOC_CS4270_VD33_ERRAT
  	depends on SND_SOC_CS4270
  
  config SND_SOC_CS4271
 -	tristate
 +	tristate "Cirrus Logic CS4271 CODEC"
 +	depends on SND_SOC_I2C_AND_SPI
  
+ config SND_SOC_CS42XX8
+ 	tristate
+ 
+ config SND_SOC_CS42XX8_I2C
+ 	tristate "Cirrus Logic CS42448/CS42888 CODEC (I2C)"
+ 	depends on I2C
+ 	select SND_SOC_CS42XX8
+ 	select REGMAP_I2C
+ 
  config SND_SOC_CX20442
  	tristate
  	depends on TTY