From bc6f8a4b199156897f6eb5b70bf5c1a4773f4e2b Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 10 Oct 2005 22:45:07 +1000
Subject: [PATCH] powerpc: move lparmap.c to arch/powerpc/kernel
Since lparmap.s gets included in arch/powerpc/kernel/head_64.S,
this avoids depending on a file in another directory.
Signed-off-by: Paul Mackerras <paulus@samba.org>
---
arch/powerpc/kernel/Makefile | 5 +++--
arch/powerpc/{platforms/iseries => kernel}/lparmap.c | 0
arch/ppc64/kernel/Makefile | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
rename arch/powerpc/{platforms/iseries => kernel}/lparmap.c (100%)
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 0625470a6235..bc063edd6de0 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o
ifeq ($(CONFIG_PPC_ISERIES),y)
-arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s
-AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries
+$(obj)/head_64.o: $(obj)/lparmap.s
+AFLAGS_head_64.o += -I$(obj)
+endif
endif
diff --git a/arch/powerpc/platforms/iseries/lparmap.c b/arch/powerpc/kernel/lparmap.c
similarity index 100%
rename from arch/powerpc/platforms/iseries/lparmap.c
rename to arch/powerpc/kernel/lparmap.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 6a0fea272386..79366e4a9e5c 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -70,7 +70,7 @@ CFLAGS_ioctl32.o += -Ifs/
ifneq ($(CONFIG_PPC_MERGE),y)
ifeq ($(CONFIG_PPC_ISERIES),y)
-arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s
-AFLAGS_head.o += -Iarch/powerpc/platforms/iseries
+arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
+AFLAGS_head.o += -Iarch/powerpc/kernel
endif
endif
--
2.34.1