Merge /spare/repo/linux-2.6/

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h
index d752e6426894..b2f969bc7845 100644
--- a/sound/arm/aaci.h
+++ b/sound/arm/aaci.h
@@ -200,8 +200,8 @@
 
 
 struct aaci_runtime {
-        void                    *base;
-        void                    *fifo;
+        void                    __iomem *base;
+        void                    __iomem *fifo;
 
         struct ac97_pcm         *pcm;
         int                     pcm_open;
@@ -223,7 +223,7 @@ struct aaci_runtime {
 struct aaci {
         struct amba_device      *dev;
         snd_card_t              *card;
-        void                    *base;
+        void                    __iomem *base;
         unsigned int            fifosize;
 
         /* AC'97 */