diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-13 09:27:39 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-12-04 20:39:05 +1100 |
| commit | 68a64357d15ae4f596e92715719071952006e83c (patch) | |
| tree | dee519239225e92169ef77e4fad3be25c4dffe9d /include/asm-powerpc/machdep.h | |
| parent | [POWERPC] Remove ioremap64 and fixup_bigphys_addr (diff) | |
| download | linux-dev-68a64357d15ae4f596e92715719071952006e83c.tar.xz linux-dev-68a64357d15ae4f596e92715719071952006e83c.zip | |
[POWERPC] Merge 32 and 64 bits asm-powerpc/io.h
powerpc: Merge 32 and 64 bits asm-powerpc/io.h
The rework on io.h done for the new hookable accessors made it easier,
so I just finished the work and merged 32 and 64 bits io.h for arch/powerpc.
arch/ppc still uses the old version in asm-ppc, there is just too much gunk
in there that I really can't be bothered trying to cleanup.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/machdep.h')
| -rw-r--r-- | include/asm-powerpc/machdep.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h index 8c1a2dfe5cc7..1b04e5723548 100644 --- a/include/asm-powerpc/machdep.h +++ b/include/asm-powerpc/machdep.h @@ -88,9 +88,9 @@ struct machdep_calls { void (*pci_dma_dev_setup)(struct pci_dev *dev); void (*pci_dma_bus_setup)(struct pci_bus *bus); - void __iomem * (*ioremap)(unsigned long addr, unsigned long size, + void __iomem * (*ioremap)(phys_addr_t addr, unsigned long size, unsigned long flags); - void (*iounmap)(void __iomem *token); + void (*iounmap)(volatile void __iomem *token); #endif /* CONFIG_PPC64 */ int (*probe)(void); |