summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-09 00:22:10 +0400
committerMark Brown <broonie@linaro.org>2014-04-09 00:22:10 +0400
commit30659894f379452d3ebaa00d44b118f1237fbcaf (patch)
tree5678c7261d7fc830b3e7d8708417f57f10e45932 /include
parente9b433cf86ff4a314f3992fe0b7a9fe26cc5072a (diff)
parentc159a85013afbb8283f0c7272812952e04d5c3a1 (diff)
downloadlinux-30659894f379452d3ebaa00d44b118f1237fbcaf.tar.xz
Merge tag 'asoc-v3.15-4' into asoc-linus
ASoC: Final updates for v3.15 merge window A few more updates from last week - use of the tdm_slot mapping from Xiubo plus a few smaller fixes and cleanups. # gpg: Signature made Mon 31 Mar 2014 10:49:42 BST using RSA key ID 7EA229BD # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" # gpg: aka "Mark Brown <broonie@debian.org>" # gpg: aka "Mark Brown <broonie@kernel.org>" # gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>" # gpg: aka "Mark Brown <broonie@linaro.org>" # gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc-dai.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 2f66d5e8cd15..fad76769f153 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -142,7 +142,7 @@ struct snd_soc_dai_ops {
* Called by soc_card drivers, normally in their hw_params.
*/
int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt);
- int (*of_xlate_tdm_slot_mask)(unsigned int slots,
+ int (*xlate_tdm_slot_mask)(unsigned int slots,
unsigned int *tx_mask, unsigned int *rx_mask);
int (*set_tdm_slot)(struct snd_soc_dai *dai,
unsigned int tx_mask, unsigned int rx_mask,