diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-26 23:51:59 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-26 23:51:59 -0400 |
commit | bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch) | |
tree | 30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /arch/ppc64/kernel/pSeries_setup.c | |
parent | 51a0885ed7f883758462926b35fbd6f09f9c717c (diff) |
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>
Diffstat (limited to 'arch/ppc64/kernel/pSeries_setup.c')
-rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index 3009701eb90d..b9bcff21b463 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/ppc64/kernel/pSeries_setup.c | |||
@@ -62,9 +62,9 @@ | |||
62 | #include <asm/xics.h> | 62 | #include <asm/xics.h> |
63 | #include <asm/firmware.h> | 63 | #include <asm/firmware.h> |
64 | #include <asm/pmc.h> | 64 | #include <asm/pmc.h> |
65 | #include <asm/mpic.h> | ||
65 | 66 | ||
66 | #include "i8259.h" | 67 | #include "i8259.h" |
67 | #include "mpic.h" | ||
68 | #include "pci.h" | 68 | #include "pci.h" |
69 | 69 | ||
70 | #ifdef DEBUG | 70 | #ifdef DEBUG |