diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:04 -0400 |
| commit | 38e8c895d33b0642dc341f83cce0adde4cffbc82 (patch) | |
| tree | 3657c043986d5c944f971c9685ae4a68f5a5b035 /sound/soc/tegra/tegra20_ac97.h | |
| parent | d66e065c5b8b64b03a9d9b8a7c5d674c7dfa2e3d (diff) | |
| parent | 69b6f19622ce0aef41df884b75e3f789c64b89c0 (diff) | |
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 dddc6828004e..4acb3aaba29b 100644 --- a/sound/soc/tegra/tegra20_ac97.h +++ b/sound/soc/tegra/tegra20_ac97.h | |||
| @@ -85,8 +85,8 @@ | |||
| 85 | 85 | ||
| 86 | struct tegra20_ac97 { | 86 | struct tegra20_ac97 { |
| 87 | struct clk *clk_ac97; | 87 | struct clk *clk_ac97; |
| 88 | struct tegra_pcm_dma_params capture_dma_data; | 88 | struct snd_dmaengine_dai_dma_data capture_dma_data; |
| 89 | struct tegra_pcm_dma_params playback_dma_data; | 89 | struct snd_dmaengine_dai_dma_data playback_dma_data; |
| 90 | struct regmap *regmap; | 90 | struct regmap *regmap; |
| 91 | int reset_gpio; | 91 | int reset_gpio; |
| 92 | int sync_gpio; | 92 | int sync_gpio; |