diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-04-10 06:46:01 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-04-10 06:48:35 +0300 |
| commit | 8859a44ea0df92bccdc942ef15781ebbfe0ad9f3 (patch) | |
| tree | bffdd602a7d6ad5060df41789af75965f9d58270 /sound/soc/sof/intel/hda.h | |
| parent | 6c5e6b4ccc1bb9ac56579a9aed25d517d2318be6 (diff) | |
| parent | 4e04e7513b0fa2fe8966a1c83fb473f1667e2810 (diff) | |
| download | linux-8859a44ea0df92bccdc942ef15781ebbfe0ad9f3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
MAINTAINERS
- keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
- simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
- trivial
include/linux/ethtool.h
- trivial, fix kdoc while at it
include/linux/skmsg.h
- move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
- add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
- trivial
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'sound/soc/sof/intel/hda.h')
| -rw-r--r-- | sound/soc/sof/intel/hda.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 7c7579daee7f..ae80725b0e33 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -517,6 +517,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev); int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev); int hda_dsp_runtime_resume(struct snd_sof_dev *sdev); int hda_dsp_runtime_idle(struct snd_sof_dev *sdev); +int hda_dsp_shutdown(struct snd_sof_dev *sdev); int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev); void hda_dsp_dump(struct snd_sof_dev *sdev, u32 flags); void hda_ipc_dump(struct snd_sof_dev *sdev); |