diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-06-03 20:00:49 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-06-03 20:00:49 +0300 |
| commit | a9e906b71f963f19aabf7af59f73f37c929a5221 (patch) | |
| tree | 0228f82f4719160cfa4635c0c042c9c73fc2d2a5 /include/sound/soc-dai.h | |
| parent | 475ea6c60279e9f2ddf7e4cf2648cd8ae0608361 (diff) | |
| parent | fcf6631f3736985ec89bdd76392d3c7bfb60119f (diff) | |
| download | linux-a9e906b71f963f19aabf7af59f73f37c929a5221.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/sound/soc-dai.h')
| -rw-r--r-- | include/sound/soc-dai.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 1358a0ceb4d0..0bc29c4516e7 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -81,7 +81,7 @@ struct snd_compr_stream; #define SND_SOC_DAIFMT_CBP_CFP (1 << 12) /* codec clk provider & frame provider */ #define SND_SOC_DAIFMT_CBC_CFP (2 << 12) /* codec clk consumer & frame provider */ #define SND_SOC_DAIFMT_CBP_CFC (3 << 12) /* codec clk provider & frame consumer */ -#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame follower */ +#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame consumer */ /* previous definitions kept for backwards-compatibility, do not use in new contributions */ #define SND_SOC_DAIFMT_CBM_CFM SND_SOC_DAIFMT_CBP_CFP |