aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:24:11 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:24:11 +0100
commit5b2ad46d6eb69a7910a02ce32e977b48897b1ff4 (patch)
treedb1f83dd08c939398706639fd3767a3421100b2b /include/sound
parentMerge remote-tracking branch 'asoc/topic/pxa' into asoc-next (diff)
parentASoC: rcar: remove RSND_SSI_CLK_FROM_ADG (diff)
downloadlinux-dev-5b2ad46d6eb69a7910a02ce32e977b48897b1ff4.tar.xz
linux-dev-5b2ad46d6eb69a7910a02ce32e977b48897b1ff4.zip
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/rcar_snd.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h
index fb0a312bcb81..12afab18945d 100644
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.h
@@ -36,7 +36,6 @@
#define RSND_SSI_CLK_PIN_SHARE (1 << 31)
#define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */
#define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */
-#define RSND_SSI_DEPENDENT (1 << 28) /* SSI needs SRU/SCU */
#define RSND_SSI_PLAY (1 << 24)