From: Mark Brown Date: Tue, 27 May 2014 19:55:27 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/topic/cache', 'asoc/topic/cs42l56' and 'asoc... X-Git-Tag: next-20140530~63^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30869c2c2656182282f71701620d449862d0388e;p=karo-tx-linux.git Merge remote-tracking branches 'asoc/topic/cache', 'asoc/topic/cs42l56' and 'asoc/topic/cs42xx8' into asoc-next --- 30869c2c2656182282f71701620d449862d0388e diff --cc sound/soc/codecs/Kconfig index 74cbf29e3ed5,f0e840137887,755372509cc8,f0e840137887..99e0bdcb3290 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@@@@ -223,38 -215,9 -216,9 -215,9 +224,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