diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 10:54:06 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-23 10:54:06 -0700 |
| commit | 2c9ee33d37a6f3808c4319f0849671fafa8a6f4c (patch) | |
| tree | 2047f0a8460d7df8d9c96e6924be0bc97ae5d403 /sound/soc/davinci/davinci-mcasp.h | |
| parent | 766df6d98f9c28dfc6f72c23a010819719e4c3e0 (diff) | |
| parent | 539d3d8cbe5cf7597d4c4c4428aec242f9ea5185 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/davinci/davinci-mcasp.h')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 554354c1cc2..9d179cc88f7 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -39,10 +39,15 @@ enum { }; struct davinci_audio_dev { + /* + * dma_params must be first because rtd->dai->cpu_dai->private_data + * is cast to a pointer of an array of struct davinci_pcm_dma_params in + * davinci_pcm_open. + */ + struct davinci_pcm_dma_params dma_params[2]; void __iomem *base; int sample_rate; struct clk *clk; - struct davinci_pcm_dma_params *dma_params[2]; unsigned int codec_fmt; /* McASP specific data */ |