Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[pandora-kernel.git] / sound / arm / aaci.h

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index 04c4568..5791bd5 100644 (file)
--- 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,14 @@ 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;