diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-05-08 10:29:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-05-08 10:29:31 +0200 |
| commit | 5095c418b939186c2eac4fabf14d0036656a8ab1 (patch) | |
| tree | bacd65f786f8decc42525fe411d81c687ff38f52 /sound/soc/sof/intel/Kconfig | |
| parent | 80a5052db75131423b67f38b21958555d7d970e4 (diff) | |
| parent | ce38a75089f70f6380fc63a5478a7659b4eb3f47 (diff) | |
Merge tag 'asoc-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
A bunch of driver specific fixes that came in since the initial pull
request for v5.2, mainly warning fixes for the newly added Sound Open
Firmware code which people appeared to only start looking at after I'd
sent the pull request.
Diffstat (limited to 'sound/soc/sof/intel/Kconfig')
| -rw-r--r-- | sound/soc/sof/intel/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 32ee0fabab92..603e0db4f012 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -36,7 +36,7 @@ config SND_SOC_SOF_INTEL_HIFI_EP_IPC config SND_SOC_SOF_INTEL_ATOM_HIFI_EP tristate - select SND_SOC_INTEL_COMMON + select SND_SOC_SOF_INTEL_COMMON select SND_SOC_SOF_INTEL_HIFI_EP_IPC help This option is not user-selectable but automagically handled by |