diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 07:45:47 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 07:45:47 +0200 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /sound/arm/aaci.c | |
| parent | [ACPI] revert bad processor_core.c patch for bug 5128 (diff) | |
| parent | [SCSI] Re-do "final klist fixes" (diff) | |
| download | linux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz linux-64e47488c913ac704d465a6af86a26786d1412a5.zip | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'sound/arm/aaci.c')
| -rw-r--r-- | sound/arm/aaci.c | 4 |
1 files changed, 2 insertions, 2 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); |