diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-12 23:27:39 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 10:39:05 +0100 |
| commit | 68a64357d15ae4f596e92715719071952006e83c (patch) | |
| tree | dee519239225e92169ef77e4fad3be25c4dffe9d /arch/powerpc/kernel/iomap.c | |
| parent | [POWERPC] Remove ioremap64 and fixup_bigphys_addr (diff) | |
| download | linux-68a64357d15ae4f596e92715719071952006e83c.tar.xz linux-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 'arch/powerpc/kernel/iomap.c')
| -rw-r--r-- | arch/powerpc/kernel/iomap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c index a13a93dfc655..c68113371050 100644 --- a/arch/powerpc/kernel/iomap.c +++ b/arch/powerpc/kernel/iomap.c @@ -106,7 +106,7 @@ EXPORT_SYMBOL(iowrite32_rep); void __iomem *ioport_map(unsigned long port, unsigned int len) { - return (void __iomem *) (port+pci_io_base); + return (void __iomem *) (port + _IO_BASE); } void ioport_unmap(void __iomem *addr) |