From 665a1d75b9360d2eee0ffe813177464973c2f230 Mon Sep 17 00:00:00 2001 From: "viro@ZenIV.linux.org.uk" Date: Tue, 6 Sep 2005 02:06:57 +0100 Subject: [PATCH] --- yaml --- r: 7532 b: refs/heads/master c: e12ba644eefa9b8df4f961be91f1a0c5ea5038fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/arm/aaci.c | 4 ++-- trunk/sound/arm/aaci.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c1d65cac5b61..2eaf1a31d9be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90dffc03ca8caa0ea047f11c81fe61cd86d80568 +refs/heads/master: e12ba644eefa9b8df4f961be91f1a0c5ea5038fa diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c index 08cc3ddca96f..98877030d579 100644 --- a/trunk/sound/arm/aaci.c +++ b/trunk/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/trunk/sound/arm/aaci.h b/trunk/sound/arm/aaci.h index d752e6426894..b2f969bc7845 100644 --- a/trunk/sound/arm/aaci.h +++ b/trunk/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 */