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_smp.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_smp.c')
-rw-r--r-- | arch/ppc64/kernel/pSeries_smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/ppc64/kernel/pSeries_smp.c index d2c7e2c4733b..5d1ed850f47b 100644 --- a/arch/ppc64/kernel/pSeries_smp.c +++ b/arch/ppc64/kernel/pSeries_smp.c | |||
@@ -46,8 +46,8 @@ | |||
46 | #include <asm/rtas.h> | 46 | #include <asm/rtas.h> |
47 | #include <asm/plpar_wrappers.h> | 47 | #include <asm/plpar_wrappers.h> |
48 | #include <asm/pSeries_reconfig.h> | 48 | #include <asm/pSeries_reconfig.h> |
49 | #include <asm/mpic.h> | ||
49 | 50 | ||
50 | #include "mpic.h" | ||
51 | #include "bpa_iic.h" | 51 | #include "bpa_iic.h" |
52 | 52 | ||
53 | #ifdef DEBUG | 53 | #ifdef DEBUG |