diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-16 22:58:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-16 22:58:45 +0100 |
| commit | f7acb3694a999fdf04dc3096e8416a0bfdabd590 (patch) | |
| tree | 8e796f5a1d7d4b2c4398c0577174d0e9f77be3c7 /include/sound/soc-dai.h | |
| parent | c8dd1fec47d0b1875f292c40bed381b343e38b40 (diff) | |
| parent | 5f3484ac8775a183f855fd213907c4221d2fb11f (diff) | |
Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
Diffstat (limited to 'include/sound/soc-dai.h')
| -rw-r--r-- | include/sound/soc-dai.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 688f2ba8009f..031be2ab75d0 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -257,7 +257,6 @@ struct snd_soc_dai { struct snd_soc_dapm_widget *playback_widget; struct snd_soc_dapm_widget *capture_widget; - struct snd_soc_dapm_context dapm; /* DAI DMA data */ void *playback_dma_data; |