diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 12:59:05 +0000 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /sound/arm/aaci.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
| download | op-kernel-dev-163849ea9b4c5d50fbd324692461983d18faadad.zip op-kernel-dev-163849ea9b4c5d50fbd324692461983d18faadad.tar.gz | |
Merge branch 'for-2.6.33' into for-2.6.34
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 924f69c..6a4a2ee 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; |
