diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 15:09:44 +0100 |
commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/au1x/psc.h | |
parent | b1cd6b9ec7c749ddfad628c8c12659591ae195e6 (diff) | |
parent | 0c31cf3e4af79ea18bbd365b07ef0de207673894 (diff) |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/au1x/psc.h')
-rw-r--r-- | sound/soc/au1x/psc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h index 8fdb1a04a07..3f474e8ed4f 100644 --- a/sound/soc/au1x/psc.h +++ b/sound/soc/au1x/psc.h @@ -29,6 +29,7 @@ struct au1xpsc_audio_data { unsigned long pm[2]; struct resource *ioarea; + struct mutex lock; }; #define PCM_TX 0 |