summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 11:06:38 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 11:06:38 +0000
commit556d8b55d083ad487067680feaf179664172bd4e (patch)
tree36005d676bd1b7aeb4f3ff7dcda3f22bde051161 /include/sound/soc.h
parentf0f3214e8be1068121ba829fcd8c1c22b5bd6975 (diff)
parent8c2d6a9f9cfa59acfa63ee88e70d58f0ba3eaf21 (diff)
Merge remote-tracking branch 'asoc/topic/of' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index c76d0242c2a..a6a059ca387 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1171,6 +1171,8 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card,
const char *propname);
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
const char *propname);
+unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
+ const char *prefix);
#include <sound/soc-dai.h>