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>
mariux64 · Oct 10, 2005 · bc6f8a4 · bc6f8a4
1 parent 5a40832
commit bc6f8a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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 → arch/powerpc/kernel/lparmap.c b/arch/powerpc/platforms/iseries/lparmap.c → arch/powerpc/kernel/lparmap.c
diff --git 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