summaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/pSeries_smp.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-27 13:51:59 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-09-27 13:51:59 +1000
commitbbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch)
tree30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /arch/ppc64/kernel/pSeries_smp.c
parent51a0885ed7f883758462926b35fbd6f09f9c717c (diff)
downloadlinux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.gz
linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.bz2
linux-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.zip
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.c2
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 @@
#include <asm/rtas.h>
#include <asm/plpar_wrappers.h>
#include <asm/pSeries_reconfig.h>
+#include <asm/mpic.h>
-#include "mpic.h"
#include "bpa_iic.h"
#ifdef DEBUG