diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 15:52:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 15:52:54 +0100 |
| commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
| tree | 175b5d695437151f0f9f778ad8eb7f274468842f /sound/arm/aaci.h | |
| parent | ASoC: fix params_rate() macro use in several codecs (diff) | |
| parent | Linux 2.6.33-rc2 (diff) | |
| download | linux-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.xz linux-7f50548abb5454bd82c25aae15f0a3bf6a530f46.zip | |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'sound/arm/aaci.h')
| -rw-r--r-- | sound/arm/aaci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h index 924f69c1c44c..6a4a2eebdda1 100644 --- a/sound/arm/aaci.h +++ b/sound/arm/aaci.h @@ -202,6 +202,7 @@ struct aaci_runtime { void __iomem *base; void __iomem *fifo; + spinlock_t lock; struct ac97_pcm *pcm; int pcm_open; @@ -232,7 +233,6 @@ struct aaci { struct snd_ac97 *ac97; u32 maincr; - spinlock_t lock; struct aaci_runtime playback; struct aaci_runtime capture; |