Merge branch 'master'

[linux-2.6-omap-h63xx.git] / sound / arm / aaci.h

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index d752e64268940efe5dba7d192b4953bc8716a048..83f73c2505c6ea1145475db867c2fcfeb5570366 100644 (file)
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -200,14 +200,14 @@
 
 
 struct aaci_runtime {
-       void                    *base;
-       void                    *fifo;
+       void                    __iomem *base;
+       void                    __iomem *fifo;
 
        struct ac97_pcm         *pcm;
        int                     pcm_open;
 
        u32                     cr;
-       snd_pcm_substream_t     *substream;
+       struct snd_pcm_substream        *substream;
 
        /*
         * PIO support
@@ -222,8 +222,8 @@ struct aaci_runtime {
 
 struct aaci {
        struct amba_device      *dev;
-       snd_card_t              *card;
-       void                    *base;
+       struct snd_card         *card;
+       void                    __iomem *base;
        unsigned int            fifosize;
 
        /* AC'97 */
@@ -236,7 +236,7 @@ struct aaci {
        struct aaci_runtime     playback;
        struct aaci_runtime     capture;
 
-       snd_pcm_t               *pcm;
+       struct snd_pcm          *pcm;
 };
 
 #define ACSTREAM_FRONT         0