diff options
| author | viro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk> | 2005-09-06 03:06:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 02:17:33 +0200 |
| commit | e12ba644eefa9b8df4f961be91f1a0c5ea5038fa (patch) | |
| tree | 02a2acb3eccf0a4f98cbf5f0cac523856fc4c078 /sound/arm | |
| parent | [PATCH] lost chunk of "uml: build cleanups" (diff) | |
| download | linux-e12ba644eefa9b8df4f961be91f1a0c5ea5038fa.tar.xz linux-e12ba644eefa9b8df4f961be91f1a0c5ea5038fa.zip | |
[PATCH] iomem annotations (sound/arm/aaci)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/arm')
| -rw-r--r-- | sound/arm/aaci.c | 4 | ||||
| -rw-r--r-- | sound/arm/aaci.h | 6 |
2 files changed, 5 insertions, 5 deletions
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 */ |