diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-06-08 15:02:06 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-06-08 15:02:06 +0300 |
| commit | 0280e07bbd6efa691daa7356b6bb05514cdcab68 (patch) | |
| tree | 1ef76c078b566050dbc865ee9afeb0d526329893 /include/sound | |
| parent | 5fe8f0a0a83ab78c75010e161fa27ae66e36cd64 (diff) | |
| parent | 600dd2a7e8b62170d177381cc1303861f48f9780 (diff) | |
| download | linux-0280e07bbd6efa691daa7356b6bb05514cdcab68.tar.xz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/sound')
| -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 |