diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:25 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:25 +0300 |
commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /sound/soc/codecs/Kconfig | |
parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
download | linux-11dd60447e3b1018f9cae66737cb902b519d3454.tar.xz |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r-- | sound/soc/codecs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 064e6c18e109..ea9f0e31f9d4 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -69,7 +69,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98090 if I2C select SND_SOC_MAX98095 if I2C - select SND_SOC_MAX98357A + select SND_SOC_MAX98357A if GPIOLIB select SND_SOC_MAX9850 if I2C select SND_SOC_MAX9768 if I2C select SND_SOC_MAX9877 if I2C |