diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:41 +0200 |
| commit | 7445c995b06f2a999541ccf127886d24a2a7d012 (patch) | |
| tree | 940cb9cce2e2e3dcbbe3502bf720fd10481769af /include/sound/soc.h | |
| parent | 1172234cbe94658c16bc83e50ca57b5a47085209 (diff) | |
| parent | 5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 (diff) | |
| download | linux-3.10-7445c995b06f2a999541ccf127886d24a2a7d012.tar.gz linux-3.10-7445c995b06f2a999541ccf127886d24a2a7d012.tar.bz2 linux-3.10-7445c995b06f2a999541ccf127886d24a2a7d012.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 5d234a8c250..a57fbfcd4c8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -375,6 +375,7 @@ struct snd_soc_pcm_stream { unsigned int channels_min; /* min channels */ unsigned int channels_max; /* max channels */ unsigned int active:1; /* stream is in use */ + void *dma_data; /* used by platform code */ }; /* SoC audio ops */ |