From 01f755bf7e869ade2d0c1ce6aa009b9f28e6c041 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 29 Sep 2005 01:46:29 +1000 Subject: [PATCH] --- yaml --- r: 11508 b: refs/heads/master c: d96024c688b59d4d1e60dbb0e226964eb758aa01 h: refs/heads/master v: v3 --- [refs] | 2 +- .../{ppc64/kernel => powerpc/platforms/iseries}/lparmap.c | 0 trunk/arch/ppc64/kernel/Makefile | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename trunk/arch/{ppc64/kernel => powerpc/platforms/iseries}/lparmap.c (100%) diff --git a/[refs] b/[refs] index 82c6056f04f4..72e1469a3ef6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee400b63f37120987bd12a2fada850c6212d7563 +refs/heads/master: d96024c688b59d4d1e60dbb0e226964eb758aa01 diff --git a/trunk/arch/ppc64/kernel/lparmap.c b/trunk/arch/powerpc/platforms/iseries/lparmap.c similarity index 100% rename from trunk/arch/ppc64/kernel/lparmap.c rename to trunk/arch/powerpc/platforms/iseries/lparmap.c diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index 9d4836fe3720..16e34de34178 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/arch/ppc64/kernel/Makefile @@ -70,8 +70,8 @@ obj-$(CONFIG_KPROBES) += kprobes.o CFLAGS_ioctl32.o += -Ifs/ ifeq ($(CONFIG_PPC_ISERIES),y) -arch/ppc64/kernel/head.o: arch/ppc64/kernel/lparmap.s -AFLAGS_head.o += -Iarch/ppc64/kernel +arch/ppc64/kernel/head.o: arch/powerpc/platforms/iseries/lparmap.s +AFLAGS_head.o += -Iarch/powerpc/platforms/iseries endif # These are here while we do the architecture merge