Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 3 deletions

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 6a4a2eebdda1..5791bd5bd2ab 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -210,6 +210,8 @@ struct aaci_runtime {
         u32                     cr;
         struct snd_pcm_substream        *substream;
 
+        unsigned int            period; /* byte size of a "period" */
+
         /*
          * PIO support
          */
@@ -217,15 +219,16 @@ struct aaci_runtime {
         void                    *end;
         void                    *ptr;
         int                     bytes;
-        unsigned int            period;
-        unsigned int            fifosz;
+        unsigned int            fifo_bytes;
 };
 
 struct aaci {
         struct amba_device      *dev;
         struct snd_card         *card;
         void                    __iomem *base;
-        unsigned int            fifosize;
+        unsigned int            fifo_depth;
+        unsigned int            users;
+        struct mutex            irq_lock;
 
         /* AC'97 */
         struct mutex            ac97_sem;