aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
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 0625470a6235..bc063edd6de0 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
33obj-$(CONFIG_BOOTX_TEXT) += btext.o 33obj-$(CONFIG_BOOTX_TEXT) += btext.o
34 34
35ifeq ($(CONFIG_PPC_ISERIES),y) 35ifeq ($(CONFIG_PPC_ISERIES),y)
36arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s 36$(obj)/head_64.o: $(obj)/lparmap.s
37AFLAGS_head_64.o += -Iarch/powerpc/platforms/iseries 37AFLAGS_head_64.o += -I$(obj)
38endif
38endif 39endif
diff --git a/arch/powerpc/platforms/iseries/lparmap.c b/arch/powerpc/kernel/lparmap.c
index b81de286df5e..b81de286df5e 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 6a0fea272386..79366e4a9e5c 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -70,7 +70,7 @@ CFLAGS_ioctl32.o += -Ifs/
70 70
71ifneq ($(CONFIG_PPC_MERGE),y) 71ifneq ($(CONFIG_PPC_MERGE),y)
72ifeq ($(CONFIG_PPC_ISERIES),y) 72ifeq ($(CONFIG_PPC_ISERIES),y)
73arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s 73arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
74AFLAGS_head.o += -Iarch/powerpc/platforms/iseries 74AFLAGS_head.o += -Iarch/powerpc/kernel
75endif 75endif
76endif 76endif