Merge branch 'fix/misc' into for-linus

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;