diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-11 18:11:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-11 18:11:22 +0200 |
| commit | 7a1be1a5536242bbd15b227173a89d28607a27a8 (patch) | |
| tree | 2db94912d695c90d108ae325d7bc79dbad520264 /include/sound | |
| parent | ASoC: Intel: Fix printk formatting (diff) | |
| parent | ASoC: Change DAI link's be_id to a generic id (diff) | |
| download | linux-7a1be1a5536242bbd15b227173a89d28607a27a8.tar.xz linux-7a1be1a5536242bbd15b227173a89d28607a27a8.zip | |
Merge branch 'topic/dai-link' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 02b4a215fd75..ef25e86d51ee 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1002,7 +1002,7 @@ struct snd_soc_dai_link { */ const char *platform_name; struct device_node *platform_of_node; - int be_id; /* optional ID for machine driver BE identification */ + int id; /* optional ID for machine driver link identification */ const struct snd_soc_pcm_stream *params; unsigned int num_params; |