summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-11 19:11:22 +0300
committerMark Brown <broonie@kernel.org>2016-05-11 19:11:22 +0300
commit7a1be1a5536242bbd15b227173a89d28607a27a8 (patch)
tree2db94912d695c90d108ae325d7bc79dbad520264 /include/sound
parent396cbebeeb9734aee8efe39431d3b96655bf1e94 (diff)
parent2f0ad49104cbb19db24442af736614659363d2ab (diff)
downloadlinux-7a1be1a5536242bbd15b227173a89d28607a27a8.tar.xz
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.h2
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;