diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-02-02 18:48:28 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-02-02 18:48:33 +0100 |
| commit | 5c953a226300c961771bc20da6aedf83a980c113 (patch) | |
| tree | 559341a5e56db25bd1b091354e36ab301f01c119 /include/sound | |
| parent | 9119e5661eab2c56a96b936cde49c6740dc49ff9 (diff) | |
| parent | 4841b8e6318a7f0ae57c4e5ec09032ea057c97a8 (diff) | |
Merge branch 'for-linus' into for-next
Back-merge the 5.11 devel branch for further patching.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 2336bf9243e1..2e1200d17d0c 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -229,7 +229,7 @@ typedef int (*snd_pcm_hw_rule_func_t)(struct snd_pcm_hw_params *params, struct snd_pcm_hw_rule { unsigned int cond; int var; - int deps[4]; + int deps[5]; snd_pcm_hw_rule_func_t func; void *private; |