diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
| commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
| tree | 67c98488983a71305e24940930d6e27a96d54db2 /sound/arm/Kconfig | |
| parent | 6c084839877666d987ff8bc4e0facd3c02d99d61 (diff) | |
| parent | f2cf0ef7c0ce141bb38f315c34c56e6ef5667a27 (diff) | |
| download | blackbird-obmc-linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.gz blackbird-obmc-linux-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.zip | |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'sound/arm/Kconfig')
| -rw-r--r-- | sound/arm/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig index 65171f6657a2..5fbd47a9177e 100644 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig @@ -17,14 +17,9 @@ config SND_ARMAACI select SND_PCM select SND_AC97_CODEC -config SND_PXA2XX_PCM - tristate - select SND_PCM - config SND_PXA2XX_AC97 tristate "AC97 driver for the Intel PXA2xx chip" depends on ARCH_PXA - select SND_PXA2XX_PCM select SND_AC97_CODEC select SND_PXA2XX_LIB select SND_PXA2XX_LIB_AC97 |
