diff options
| -rw-r--r-- | arch/powerpc/platforms/iseries/lparmap.c (renamed from arch/ppc64/kernel/lparmap.c) | 0 | ||||
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/lparmap.c b/arch/powerpc/platforms/iseries/lparmap.c index b81de286df5e..b81de286df5e 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 9d4836fe3720..16e34de34178 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
| @@ -70,8 +70,8 @@ obj-$(CONFIG_KPROBES) += kprobes.o | |||
| 70 | CFLAGS_ioctl32.o += -Ifs/ | 70 | CFLAGS_ioctl32.o += -Ifs/ |
| 71 | 71 | ||
| 72 | ifeq ($(CONFIG_PPC_ISERIES),y) | 72 | ifeq ($(CONFIG_PPC_ISERIES),y) |
| 73 | arch/ppc64/kernel/head.o: arch/ppc64/kernel/lparmap.s | 73 | arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s |
| 74 | AFLAGS_head.o += -Iarch/ppc64/kernel | 74 | AFLAGS_head.o += -Iarch/powerpc/platforms/iseries |
| 75 | endif | 75 | endif |
| 76 | 76 | ||
| 77 | # These are here while we do the architecture merge | 77 | # These are here while we do the architecture merge |