summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-05 22:19:32 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-04-05 22:19:32 +0400
commit53a61d967a480307db4c8f7950ddb8bb1a0fda9b (patch)
tree6b3ce07b14db2986a175f30e6477ed40445c7c17 /include/sound
parent8876698406147986a9a7748586a54c4b14514c0e (diff)
parent5f712b2b73a9fc87fcc52124cfe8adefaa0c92f5 (diff)
downloadlinux-53a61d967a480307db4c8f7950ddb8bb1a0fda9b.tar.xz
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.h2
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 */
};