diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 13:51:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 13:51:59 +1000 |
| commit | bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119 (patch) | |
| tree | 30180a33fb5bb9a5c633e93d533b7f4ffc800e2e /arch/ppc64/kernel/rtas_pci.c | |
| parent | Merge refs/heads/devtree from rsync://oak/kernels/iseries/work/.git (diff) | |
| download | linux-dev-bbeb3f4c55f666df7bcd2655b303dfb8c4d1a119.tar.xz linux-dev-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/rtas_pci.c')
| -rw-r--r-- | arch/ppc64/kernel/rtas_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/rtas_pci.c b/arch/ppc64/kernel/rtas_pci.c index 4a9719b48abe..4d920dd41dc6 100644 --- a/arch/ppc64/kernel/rtas_pci.c +++ b/arch/ppc64/kernel/rtas_pci.c @@ -38,8 +38,8 @@ #include <asm/pci-bridge.h> #include <asm/iommu.h> #include <asm/rtas.h> +#include <asm/mpic.h> -#include "mpic.h" #include "pci.h" /* RTAS tokens */ |