From 482c6da2eb7a5cb79ac29d51f22196aa3c366712 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Thu, 10 Nov 2005 12:42:17 +1100 Subject: [PATCH] --- yaml --- r: 13725 b: refs/heads/master c: f6d3577da14e877b79517c883d1139ee6ad7da45 h: refs/heads/master i: 13723: 2f6ece18d5222069ca20d67db104973bfd4988c8 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/Makefile | 1 + .../arch/{ppc64/kernel => powerpc/platforms/pseries}/scanlog.c | 0 trunk/arch/ppc64/kernel/Makefile | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/{ppc64/kernel => powerpc/platforms/pseries}/scanlog.c (100%) diff --git a/[refs] b/[refs] index f8dc3e5c2620..72508ce3532d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26ef5c09576496dfd08d2b36ec1d08a6f917a0eb +refs/heads/master: f6d3577da14e877b79517c883d1139ee6ad7da45 diff --git a/trunk/arch/powerpc/platforms/pseries/Makefile b/trunk/arch/powerpc/platforms/pseries/Makefile index 27515476ad6c..e7ca5b1f591e 100644 --- a/trunk/arch/powerpc/platforms/pseries/Makefile +++ b/trunk/arch/powerpc/platforms/pseries/Makefile @@ -3,4 +3,5 @@ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_XICS) += xics.o +obj-$(CONFIG_SCANLOG) += scanlog.o obj-$(CONFIG_EEH) += eeh.o eeh_event.o diff --git a/trunk/arch/ppc64/kernel/scanlog.c b/trunk/arch/powerpc/platforms/pseries/scanlog.c similarity index 100% rename from trunk/arch/ppc64/kernel/scanlog.c rename to trunk/arch/powerpc/platforms/pseries/scanlog.c diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index 1f71f23cc26d..048ba910f028 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/arch/ppc64/kernel/Makefile @@ -36,7 +36,6 @@ ifneq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_MODULES) += ppc_ksyms.o endif obj-$(CONFIG_PPC_RTAS) += rtas_pci.o -obj-$(CONFIG_SCANLOG) += scanlog.o obj-$(CONFIG_LPARCFG) += lparcfg.o obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o ifneq ($(CONFIG_PPC_MERGE),y)