powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
authorPaul Mackerras <paulus@samba.org>
Sat, 19 Nov 2005 09:17:32 +0000 (20:17 +1100)
committerPaul Mackerras <paulus@samba.org>
Sat, 19 Nov 2005 09:17:32 +0000 (20:17 +1100)
commit047ea7846565917c4a666635fa1fa4b5c587cd55
tree409c8f6ddd1f145fb364a8d6f813febd0c94d06b
parent800fc3eeb0eed3bf98d621c0da24d68cabcf6526
powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc

For these, I have just done the lame-o merge where the file ends up
looking like:

#ifndef CONFIG_PPC64
#include <asm-ppc/foo.h>
#else
... contents from asm-ppc64/foo.h
#endif

so nothing has changed, really, except that we reduce include/asm-ppc64
a bit more.

Signed-off-by: Paul Mackerras <paulus@samba.org>
18 files changed:
include/asm-powerpc/io.h [new file with mode: 0644]
include/asm-powerpc/mmu.h [new file with mode: 0644]
include/asm-powerpc/mmu_context.h [new file with mode: 0644]
include/asm-powerpc/mmzone.h [new file with mode: 0644]
include/asm-powerpc/pci-bridge.h [new file with mode: 0644]
include/asm-powerpc/pgalloc.h [new file with mode: 0644]
include/asm-powerpc/pgtable-4k.h [new file with mode: 0644]
include/asm-powerpc/pgtable-64k.h [new file with mode: 0644]
include/asm-powerpc/pgtable.h [new file with mode: 0644]
include/asm-ppc64/io.h [deleted file]
include/asm-ppc64/mmu.h [deleted file]
include/asm-ppc64/mmu_context.h [deleted file]
include/asm-ppc64/mmzone.h [deleted file]
include/asm-ppc64/pci-bridge.h [deleted file]
include/asm-ppc64/pgalloc.h [deleted file]
include/asm-ppc64/pgtable-4k.h [deleted file]
include/asm-ppc64/pgtable-64k.h [deleted file]
include/asm-ppc64/pgtable.h [deleted file]