diff options
| author | Benjamin Herrenschmidt | 2006-11-12 23:27:39 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2006-12-04 10:39:05 +0100 |
| commit | 68a64357d15ae4f596e92715719071952006e83c (patch) | |
| tree | dee519239225e92169ef77e4fad3be25c4dffe9d /arch/powerpc/kernel/Makefile | |
| parent | [POWERPC] Remove ioremap64 and fixup_bigphys_addr (diff) | |
| download | kernel-qcow2-linux-68a64357d15ae4f596e92715719071952006e83c.tar.gz kernel-qcow2-linux-68a64357d15ae4f596e92715719071952006e83c.tar.xz kernel-qcow2-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/Makefile')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 600954df07ae..f9ce5d798de3 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o ifneq ($(CONFIG_PPC_INDIRECT_IO),y) -pci64-$(CONFIG_PPC64) += iomap.o +obj-y += iomap.o endif ifeq ($(CONFIG_PPC_ISERIES),y) |