diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 15:05:30 +0100 |
| commit | d45a26bd9790fcde58cf4b11a775ff56c6b44e0b (patch) | |
| tree | 71b75e94b7a586123331eed46e91d25dd88ff52a /sound/soc/tegra/tegra20_ac97.h | |
| parent | 8ef53f689afea7f2da360cb27d7af040c1216bfa (diff) | |
| parent | 22f38f792ec53e2a93be13ecb609bbe911ed8ff9 (diff) | |
| download | op-kernel-dev-d45a26bd9790fcde58cf4b11a775ff56c6b44e0b.zip op-kernel-dev-d45a26bd9790fcde58cf4b11a775ff56c6b44e0b.tar.gz | |
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
Diffstat (limited to 'sound/soc/tegra/tegra20_ac97.h')
| -rw-r--r-- | sound/soc/tegra/tegra20_ac97.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.h b/sound/soc/tegra/tegra20_ac97.h index dddc682..4acb3aa 100644 --- a/sound/soc/tegra/tegra20_ac97.h +++ b/sound/soc/tegra/tegra20_ac97.h @@ -85,8 +85,8 @@ struct tegra20_ac97 { struct clk *clk_ac97; - struct tegra_pcm_dma_params capture_dma_data; - struct tegra_pcm_dma_params playback_dma_data; + struct snd_dmaengine_dai_dma_data capture_dma_data; + struct snd_dmaengine_dai_dma_data playback_dma_data; struct regmap *regmap; int reset_gpio; int sync_gpio; |
