aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-29 01:46:29 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2005-09-30 18:04:10 +1000
commitd96024c688b59d4d1e60dbb0e226964eb758aa01 (patch)
treeb814632b1eaaff27be69537b2ecfa6767eeb50e5
parentee400b63f37120987bd12a2fada850c6212d7563 (diff)
powerpc: Move lparmap.c to powerpc/platforms
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r--arch/powerpc/platforms/iseries/lparmap.c (renamed from arch/ppc64/kernel/lparmap.c)0
-rw-r--r--arch/ppc64/kernel/Makefile4
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/lparmap.c b/arch/powerpc/platforms/iseries/lparmap.c
index b81de286df5..b81de286df5 100644
--- a/arch/ppc64/kernel/lparmap.c
+++ b/arch/powerpc/platforms/iseries/lparmap.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 9d4836fe372..16e34de3417 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -70,8 +70,8 @@ obj-$(CONFIG_KPROBES) += kprobes.o
CFLAGS_ioctl32.o += -Ifs/
ifeq ($(CONFIG_PPC_ISERIES),y)
-arch/ppc64/kernel/head.o: arch/ppc64/kernel/lparmap.s
-AFLAGS_head.o += -Iarch/ppc64/kernel
+arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s
+AFLAGS_head.o += -Iarch/powerpc/platforms/iseries
endif
# These are here while we do the architecture merge