aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/platforms/pseries/Makefile1
-rw-r--r--arch/powerpc/platforms/pseries/scanlog.c (renamed from arch/ppc64/kernel/scanlog.c)0
-rw-r--r--arch/ppc64/kernel/Makefile1
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 27515476ad6c..e7ca5b1f591e 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -3,4 +3,5 @@ obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \
3obj-$(CONFIG_SMP) += smp.o 3obj-$(CONFIG_SMP) += smp.o
4obj-$(CONFIG_IBMVIO) += vio.o 4obj-$(CONFIG_IBMVIO) += vio.o
5obj-$(CONFIG_XICS) += xics.o 5obj-$(CONFIG_XICS) += xics.o
6obj-$(CONFIG_SCANLOG) += scanlog.o
6obj-$(CONFIG_EEH) += eeh.o eeh_event.o 7obj-$(CONFIG_EEH) += eeh.o eeh_event.o
diff --git a/arch/ppc64/kernel/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 2edc947f7c44..2edc947f7c44 100644
--- a/arch/ppc64/kernel/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 1f71f23cc26d..048ba910f028 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -36,7 +36,6 @@ ifneq ($(CONFIG_PPC_MERGE),y)
36obj-$(CONFIG_MODULES) += ppc_ksyms.o 36obj-$(CONFIG_MODULES) += ppc_ksyms.o
37endif 37endif
38obj-$(CONFIG_PPC_RTAS) += rtas_pci.o 38obj-$(CONFIG_PPC_RTAS) += rtas_pci.o
39obj-$(CONFIG_SCANLOG) += scanlog.o
40obj-$(CONFIG_LPARCFG) += lparcfg.o 39obj-$(CONFIG_LPARCFG) += lparcfg.o
41obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o 40obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
42ifneq ($(CONFIG_PPC_MERGE),y) 41ifneq ($(CONFIG_PPC_MERGE),y)