diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 12:05:40 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 12:05:40 +0100 |
| commit | 1f26cb92a28541da1c9b27571e40b08333595773 (patch) | |
| tree | 90e9c7f7fe9bdccc6cd356afcf3977af256c9a21 /sound/arm/aaci.h | |
| parent | 2c3b9b50db5fe8d6039dfdfc44202fcd49eb9d00 (diff) | |
| parent | db8cf334f66bdf1ba2b3d2f7128095fc9b7a6e2b (diff) | |
| download | op-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.zip op-kernel-dev-1f26cb92a28541da1c9b27571e40b08333595773.tar.gz | |
Merge branch 'fix/misc' into for-linus
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; |
