diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 20:19:32 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 20:19:32 +0200 |
| commit | 53a61d967a480307db4c8f7950ddb8bb1a0fda9b (patch) | |
| tree | 6b3ce07b14db2986a175f30e6477ed40445c7c17 /include/sound | |
| parent | ASoC: Implement interrupt based WM8994 microphone detection (diff) | |
| parent | ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream (diff) | |
| download | linux-53a61d967a480307db4c8f7950ddb8bb1a0fda9b.tar.xz linux-53a61d967a480307db4c8f7950ddb8bb1a0fda9b.zip | |
Merge branch 'for-2.6.34' into for-2.6.35
Conflicts due to context changes next to the backported DMA data change:
include/sound/soc.h
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 80dfac162723..4ab3dad4a9c9 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -381,7 +381,7 @@ struct snd_soc_pcm_stream { unsigned int rate_max; /* max rate */ unsigned int channels_min; /* min channels */ unsigned int channels_max; /* max channels */ - unsigned int active; /* num of active users of the stream */ + unsigned int active; /* stream is in use */ void *dma_data; /* used by platform code */ }; |