aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-10 22:45:07 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-10 22:45:07 +1000
commitbc6f8a4b199156897f6eb5b70bf5c1a4773f4e2b (patch)
tree03ab5936f5924b7773b3ad5c486454bf66ab76af /arch
parent5a408329ed19cf2a80e831d28cbd93d2e36155a6 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/Makefile5
-rw-r--r--arch/powerpc/kernel/lparmap.c (renamed from arch/powerpc/platforms/iseries/lparmap.c)0
-rw-r--r--arch/ppc64/kernel/Makefile4
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 0625470a623..bc063edd6de 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
index b81de286df5..b81de286df5 100644
--- a/arch/powerpc/platforms/iseries/lparmap.c
+++ b/arch/powerpc/kernel/lparmap.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 6a0fea27238..79366e4a9e5 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