diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
| commit | 65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch) | |
| tree | e8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/arm/Kconfig | |
| parent | 576b354ac25b544a31f27c365410d59fcbfee064 (diff) | |
| parent | 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 (diff) | |
| download | blackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.tar.gz blackbird-obmc-linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.zip | |
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/arm/Kconfig')
| -rw-r--r-- | sound/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig index 5fbd47a9177e..28867732a318 100644 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig @@ -31,7 +31,6 @@ endif # SND_ARM config SND_PXA2XX_LIB tristate - select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97 select SND_DMAENGINE_PCM config SND_PXA2XX_LIB_AC97 |
