aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 07:48:52 -0400
committerMark Brown <broonie@kernel.org>2014-10-06 07:48:52 -0400
commit97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9 (patch)
treeabad2cc74e89d65514b501ad39fdf7a1c3546106 /include/sound
parent5bcaca4b5bf2b05cc15a2c5bfb3d95fc49607e36 (diff)
parente03f73a01f010b29504ceebda3c4fca25468516d (diff)
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index f1366ebca9c5..f90f605b3971 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -912,7 +912,7 @@ struct snd_soc_dai_link {
912 * only for codec to codec links, or systems using device tree. 912 * only for codec to codec links, or systems using device tree.
913 */ 913 */
914 const char *cpu_name; 914 const char *cpu_name;
915 const struct device_node *cpu_of_node; 915 struct device_node *cpu_of_node;
916 /* 916 /*
917 * You MAY specify the DAI name of the CPU DAI. If this information is 917 * You MAY specify the DAI name of the CPU DAI. If this information is
918 * omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node 918 * omitted, the CPU-side DAI is matched using .cpu_name/.cpu_of_node
@@ -924,7 +924,7 @@ struct snd_soc_dai_link {
924 * DT/OF node, but not both. 924 * DT/OF node, but not both.
925 */ 925 */
926 const char *codec_name; 926 const char *codec_name;
927 const struct device_node *codec_of_node; 927 struct device_node *codec_of_node;
928 /* You MUST specify the DAI name within the codec */ 928 /* You MUST specify the DAI name within the codec */
929 const char *codec_dai_name; 929 const char *codec_dai_name;
930 930
@@ -937,7 +937,7 @@ struct snd_soc_dai_link {
937 * do not need a platform. 937 * do not need a platform.
938 */ 938 */
939 const char *platform_name; 939 const char *platform_name;
940 const struct device_node *platform_of_node; 940 struct device_node *platform_of_node;
941 int be_id; /* optional ID for machine driver BE identification */ 941 int be_id; /* optional ID for machine driver BE identification */
942 942
943 const struct snd_soc_pcm_stream *params; 943 const struct snd_soc_pcm_stream *params;