diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 14:57:04 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 14:57:04 +0200 |
| commit | 38e8c895d33b0642dc341f83cce0adde4cffbc82 (patch) | |
| tree | 3657c043986d5c944f971c9685ae4a68f5a5b035 /sound/soc/tegra/tegra30_i2s.h | |
| parent | Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next (diff) | |
| parent | ASoC: ux500_pcm: Use the same snd_pcm_hardware for playback and capture (diff) | |
| download | linux-38e8c895d33b0642dc341f83cce0adde4cffbc82.tar.xz linux-38e8c895d33b0642dc341f83cce0adde4cffbc82.zip | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.h')
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.h b/sound/soc/tegra/tegra30_i2s.h index a294d942b9f7..bea23afe3b9f 100644 --- a/sound/soc/tegra/tegra30_i2s.h +++ b/sound/soc/tegra/tegra30_i2s.h @@ -231,10 +231,10 @@ struct tegra30_i2s { struct clk *clk_i2s; enum tegra30_ahub_txcif capture_i2s_cif; enum tegra30_ahub_rxcif capture_fifo_cif; - struct tegra_pcm_dma_params capture_dma_data; + struct snd_dmaengine_dai_dma_data capture_dma_data; enum tegra30_ahub_rxcif playback_i2s_cif; enum tegra30_ahub_txcif playback_fifo_cif; - struct tegra_pcm_dma_params playback_dma_data; + struct snd_dmaengine_dai_dma_data playback_dma_data; struct regmap *regmap; }; |