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

This commit is contained in:
Mark Brown
2016-05-13 14:26:23 +01:00
4 changed files with 88 additions and 0 deletions

View File

@@ -94,6 +94,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_PCM3008
select SND_SOC_PCM3168A_I2C if I2C
select SND_SOC_PCM3168A_SPI if SPI_MASTER
select SND_SOC_PCM5102A
select SND_SOC_PCM512x_I2C if I2C
select SND_SOC_PCM512x_SPI if SPI_MASTER
select SND_SOC_RT286 if I2C
@@ -575,6 +576,9 @@ config SND_SOC_PCM3168A_SPI
select SND_SOC_PCM3168A
select REGMAP_SPI
config SND_SOC_PCM5102A
tristate
config SND_SOC_PCM512x
tristate