From: Mark Brown Date: Tue, 27 May 2014 19:55:24 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adau', 'asoc/topic... X-Git-Tag: next-20140530~63^2~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a15b14e031c6e5ad078608348c6cb46b2d2a2ab;p=karo-tx-linux.git Merge remote-tracking branches 'asoc/topic/ad1980', 'asoc/topic/adau', 'asoc/topic/adsp', 'asoc/topic/ak4104', 'asoc/topic/ak4642', 'asoc/topic/alc5623', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next --- 2a15b14e031c6e5ad078608348c6cb46b2d2a2ab diff --cc sound/soc/codecs/Kconfig index c7b853f520cf,f0e840137887,dd5deea9221a,f0e840137887,f0e840137887,f0e840137887,808e964d7580,f0e840137887,f0e840137887..74cbf29e3ed5 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@@@@@@@@@ -216,9 -215,9 -222,38 -215,9 -215,9 -215,9 -215,9 -215,9 -215,9 +223,38 @@@@@@@@@@ config SND_SOC_ADAU170 depends on I2C select SND_SOC_SIGMADSP -- ------config SND_SOC_ADAU1373 ++ ++++++config SND_SOC_ADAU17X1 ++ ++++++ tristate ++ ++++++ select SND_SOC_SIGMADSP ++ ++++++ ++ ++++++config SND_SOC_ADAU1761 + + tristate ++ ++++++ select SND_SOC_ADAU17X1 ++ ++++++ ++ ++++++config SND_SOC_ADAU1761_I2C ++ +++ ++ tristate ++ ++++++ select SND_SOC_ADAU1761 ++ ++++++ select REGMAP_I2C ++ ++++++ ++ ++++++config SND_SOC_ADAU1761_SPI ++ ++++++ tristate ++ ++++++ select SND_SOC_ADAU1761 ++ ++++++ select REGMAP_SPI ++ ++++++ ++ ++++++config SND_SOC_ADAU1781 ++ ++++++ select SND_SOC_ADAU17X1 + ++++++ tristate + ++++++ ++ ++++++config SND_SOC_ADAU1781_I2C ++ ++++++ tristate ++ ++++++ select SND_SOC_ADAU1781 ++ ++++++ select REGMAP_I2C ++ ++++++ ++ ++++++config SND_SOC_ADAU1781_SPI ++ ++++++ tristate ++ ++++++ select SND_SOC_ADAU1781 ++ ++++++ select REGMAP_SPI + config SND_SOC_ADAU1977 tristate