diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 06:18:23 +0100 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 06:18:23 +0100 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /arch/parisc/mm/ioremap.c | |
| parent | Linux 2.6.20 (diff) | |
| parent | [PATCH] use __u64 rather than u64 in parisc statfs structs (diff) | |
| download | linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.xz linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'arch/parisc/mm/ioremap.c')
| -rw-r--r-- | arch/parisc/mm/ioremap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c index 44b42c7f639d..92d496ad07c9 100644 --- a/arch/parisc/mm/ioremap.c +++ b/arch/parisc/mm/ioremap.c @@ -26,7 +26,7 @@ */ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) { - void *addr; + void __iomem *addr; struct vm_struct *area; unsigned long offset, last_addr; pgprot_t pgprot; @@ -80,14 +80,14 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l if (!area) return NULL; - addr = area->addr; + addr = (void __iomem *) area->addr; if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, phys_addr, pgprot)) { vfree(addr); return NULL; } - return (void __iomem *) (offset + (char *)addr); + return (void __iomem *) (offset + (char __iomem *)addr); } EXPORT_SYMBOL(__ioremap); |