summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 13:54:31 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 13:54:31 +0000
commit51a545a343a4af02c7c1f27822c9dc63b6a8280b (patch)
treeddc1a1284abd53028a6b28436d64fe753f730e70 /sound/soc/codecs/Kconfig
parenta1916ff3500db308bff5913996a62b0bf8c4a97e (diff)
parent0471cd938e244e22f3ead77d2b82230f83e35f69 (diff)
downloadblackbird-op-linux-51a545a343a4af02c7c1f27822c9dc63b6a8280b.tar.gz
blackbird-op-linux-51a545a343a4af02c7c1f27822c9dc63b6a8280b.zip
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 629ee56a22ce..50693c867e71 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -87,7 +87,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_ML26124 if I2C
select SND_SOC_NAU8825 if I2C
select SND_SOC_PCM1681 if I2C
- select SND_SOC_PCM1792A if SPI_MASTER
+ select SND_SOC_PCM179X if SPI_MASTER
select SND_SOC_PCM3008
select SND_SOC_PCM3168A_I2C if I2C
select SND_SOC_PCM3168A_SPI if SPI_MASTER
@@ -526,8 +526,8 @@ config SND_SOC_PCM1681
tristate "Texas Instruments PCM1681 CODEC"
depends on I2C
-config SND_SOC_PCM1792A
- tristate "Texas Instruments PCM1792A CODEC"
+config SND_SOC_PCM179X
+ tristate "Texas Instruments PCM179X CODEC"
depends on SPI_MASTER
config SND_SOC_PCM3008
OpenPOWER on IntegriCloud