Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'asoc...

diff --cc sound/soc/blackfin/Kconfig
index 4544d8eb1452b24638c969ed15432a6f41e98ef8,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,359136777c4d91d3f4b173cd95e2c86f5ccf66bd,18abd884d84fd7dd916d9708100a8f02a0370c4e,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c,54f74f8cbb754a0e66aecc3953fff0c8ba63966c..b2107918f0ad06d1a740adf9ff1a818fd7d920d6
--- 1/sound/soc/blackfin/Kconfig
--- 2/sound/soc/blackfin/Kconfig
--- 3/sound/soc/blackfin/Kconfig
--- 4/sound/soc/blackfin/Kconfig
--- 5/sound/soc/blackfin/Kconfig
--- 6/sound/soc/blackfin/Kconfig
--- 7/sound/soc/blackfin/Kconfig
--- 8/sound/soc/blackfin/Kconfig
--- 9/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
@@@@@@@@@@ -44,9 -45,9 -45,9 -45,9 -45,10 -45,9 -45,9 -45,9 -45,9 +44,10 @@@@@@@@@@ config SND_SOC_BFIN_EVAL_ADAU137
         
         config SND_SOC_BFIN_EVAL_ADAV80X
                tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards"
 --------       depends on SND_BF5XX_I2S && (SPI_MASTER || I2C)
 ++++++++       depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI
                select SND_BF5XX_SOC_I2S
---- ----       select SND_SOC_ADAV80X
++++ ++++       select SND_SOC_ADAV801 if SPI_MASTER
++++ ++++       select SND_SOC_ADAV803 if I2C
                help
                  Say Y if you want to add support for the Analog Devices EVAL-ADAV801 or
                  EVAL-ADAV803 board connected to one of the Blackfin evaluation boards
@@@@@@@@@@ -65,9 -66,9 -66,9 -66,10 -67,9 -66,9 -66,9 -66,9 -66,9 +66,10 @@@@@@@@@@ config SND_BF5XX_SOC_AD183
         
         config SND_BF5XX_SOC_AD193X
                tristate "SoC AD193X Audio support for Blackfin"
 --------       depends on SND_BF5XX_I2S
 ++++++++       depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI
                select SND_BF5XX_SOC_I2S
--- -----       select SND_SOC_AD193X
+++ +++++       select SND_SOC_AD193X_I2C if I2C
+++ +++++       select SND_SOC_AD193X_SPI if SPI_MASTER
                help
                  Say Y if you want to add support for AD193X codec on Blackfin.
                  This driver supports AD1936, AD1937, AD1938 and AD1939.

diff --cc sound/soc/codecs/88pm860x-codec.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/adav80x.c
Simple merge