diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 16:09:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-09-18 16:09:44 +0200 |
| commit | 9f072b7b2260a588bfb5fb43418c3358104e7c13 (patch) | |
| tree | 055f1082093bb63a34c7bfe43c845567685d4675 /sound/soc/au1x/psc.h | |
| parent | ASoC: Return correct codec clock in s3c64xx-i2s (diff) | |
| parent | ASoC: DaVinci: Fixes to McASP configuration (diff) | |
| download | linux-9f072b7b2260a588bfb5fb43418c3358104e7c13.tar.xz linux-9f072b7b2260a588bfb5fb43418c3358104e7c13.zip | |
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 8fdb1a04a07b..3f474e8ed4f6 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 |