diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:23 +0100 |
commit | c76a507bfeaeaa82f2e306266a0722b1a2d37fde (patch) | |
tree | e76a7bf1a6ca3cc1a58ab52235f122a31246cc71 /sound/soc/mxs/mxs-saif.h | |
parent | ff868b229657d5a2e449df7b1e2cc465ec86991d (diff) | |
parent | 62477adf5f4ede918a97e648a5173b00bbbb17cc (diff) | |
download | linux-next-c76a507bfeaeaa82f2e306266a0722b1a2d37fde.tar.gz |
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
Diffstat (limited to 'sound/soc/mxs/mxs-saif.h')
-rw-r--r-- | sound/soc/mxs/mxs-saif.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-saif.h b/sound/soc/mxs/mxs-saif.h index 3cb342e5bc90..53eaa4bf0e27 100644 --- a/sound/soc/mxs/mxs-saif.h +++ b/sound/soc/mxs/mxs-saif.h @@ -117,7 +117,6 @@ struct mxs_saif { unsigned int mclk_in_use; void __iomem *base; int irq; - struct mxs_pcm_dma_params dma_param; unsigned int id; unsigned int master_id; unsigned int cur_rate; |