]> err.no Git - linux-2.6/commit
powerpc: clean up after powermac build merge
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2005 03:51:59 +0000 (13:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2005 03:51:59 +0000 (13:51 +1000)
commitbbeb3f4c55f666df7bcd2655b303dfb8c4d1a119
tree30180a33fb5bb9a5c633e93d533b7f4ffc800e2e
parent51a0885ed7f883758462926b35fbd6f09f9c717c
powerpc: clean up after powermac build merge

Complete moving arch/ppc64/kernel/mpic.h,
        include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
        and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
the originating architecture

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
22 files changed:
arch/powerpc/Makefile
arch/powerpc/platforms/Makefile [new file with mode: 0644]
arch/powerpc/platforms/embedded6xx/Kconfig
arch/ppc64/kernel/kprobes.c
arch/ppc64/kernel/maple_setup.c
arch/ppc64/kernel/mpic.c
arch/ppc64/kernel/mpic.h [deleted file]
arch/ppc64/kernel/pSeries_setup.c
arch/ppc64/kernel/pSeries_smp.c
arch/ppc64/kernel/pmac_setup.c
arch/ppc64/kernel/pmac_smp.c
arch/ppc64/kernel/rtas_pci.c
arch/ppc64/kernel/smp.c
arch/ppc64/kernel/traps.c
include/asm-powerpc/kdebug.h
include/asm-powerpc/kprobes.h
include/asm-powerpc/mpic.h
include/asm-powerpc/reg.h
include/asm-powerpc/system.h
include/asm-ppc/reg.h [deleted file]
include/asm-ppc64/kdebug.h [deleted file]
include/asm-ppc64/kprobes.h [deleted file]