diff options
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/scanlog.c (renamed from arch/ppc64/kernel/scanlog.c) | 0 | ||||
-rw-r--r-- | arch/ppc64/kernel/Makefile | 1 |
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 \ | |||
3 | obj-$(CONFIG_SMP) += smp.o | 3 | obj-$(CONFIG_SMP) += smp.o |
4 | obj-$(CONFIG_IBMVIO) += vio.o | 4 | obj-$(CONFIG_IBMVIO) += vio.o |
5 | obj-$(CONFIG_XICS) += xics.o | 5 | obj-$(CONFIG_XICS) += xics.o |
6 | obj-$(CONFIG_SCANLOG) += scanlog.o | ||
6 | obj-$(CONFIG_EEH) += eeh.o eeh_event.o | 7 | obj-$(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) | |||
36 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 36 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
37 | endif | 37 | endif |
38 | obj-$(CONFIG_PPC_RTAS) += rtas_pci.o | 38 | obj-$(CONFIG_PPC_RTAS) += rtas_pci.o |
39 | obj-$(CONFIG_SCANLOG) += scanlog.o | ||
40 | obj-$(CONFIG_LPARCFG) += lparcfg.o | 39 | obj-$(CONFIG_LPARCFG) += lparcfg.o |
41 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o | 40 | obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o |
42 | ifneq ($(CONFIG_PPC_MERGE),y) | 41 | ifneq ($(CONFIG_PPC_MERGE),y) |