3 files changed, 14 insertions, 12 deletions

diff --git a/sound/arm/Makefile b/sound/arm/Makefile
index 103f136926d9..4ef6dd00c6ee 100644
--- a/sound/arm/Makefile
+++ b/sound/arm/Makefile
@@ -2,12 +2,14 @@
 # Makefile for ALSA
 #
 
-snd-sa11xx-uda1341-objs := sa11xx-uda1341.o
-snd-aaci-objs                   := aaci.o devdma.o
-snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
-snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
-
 obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-sa11xx-uda1341.o 
+snd-sa11xx-uda1341-objs         := sa11xx-uda1341.o
+
 obj-$(CONFIG_SND_ARMAACI)       += snd-aaci.o
-obj-$(CONFIG_SND_PXA2XX_PCM) += snd-pxa2xx-pcm.o
-obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
+snd-aaci-objs                   := aaci.o devdma.o
+
+obj-$(CONFIG_SND_PXA2XX_PCM)    += snd-pxa2xx-pcm.o
+snd-pxa2xx-pcm-objs             := pxa2xx-pcm.o
+
+obj-$(CONFIG_SND_PXA2XX_AC97)   += snd-pxa2xx-ac97.o
+snd-pxa2xx-ac97-objs            := pxa2xx-ac97.o
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 08cc3ddca96f..98877030d579 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -821,7 +821,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)
 
 static unsigned int __devinit aaci_size_fifo(struct aaci *aaci)
 {
-        void *base = aaci->base + AACI_CSCH1;
+        void __iomem *base = aaci->base + AACI_CSCH1;
         int i;
 
         writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR);
@@ -877,7 +877,7 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id)
         aaci->playback.fifo = aaci->base + AACI_DR1;
 
         for (i = 0; i < 4; i++) {
-                void *base = aaci->base + i * 0x14;
+                void __iomem *base = aaci->base + i * 0x14;
 
                 writel(0, base + AACI_IE);
                 writel(0, base + AACI_TXCR);
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 */