diff -urN RC13-git3-sunsu/sound/arm/aaci.c RC13-git3-aaci/sound/arm/aaci.c
--- RC13-git3-sunsu/sound/arm/aaci.c	2005-08-10 10:37:55.000000000 -0400
+++ RC13-git3-aaci/sound/arm/aaci.c	2005-09-04 08:52:54.000000000 -0400
@@ -821,7 +821,7 @@
 
 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 @@
 	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 -urN RC13-git3-sunsu/sound/arm/aaci.h RC13-git3-aaci/sound/arm/aaci.h
--- RC13-git3-sunsu/sound/arm/aaci.h	2005-08-10 10:37:55.000000000 -0400
+++ RC13-git3-aaci/sound/arm/aaci.h	2005-09-04 08:52:54.000000000 -0400
@@ -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 {
 	struct amba_device	*dev;
 	snd_card_t		*card;
-	void			*base;
+	void			__iomem *base;
 	unsigned int		fifosize;
 
 	/* AC'97 */