[PATCH] powerpc: Move scanlog.c to platforms/pseries

scanlog.c is only compiled on pSeries.  Thus, this patch moves it to
platforms/pseries.

Built and booted on pSeries LPAR (ARCH=powerpc and ARCH=ppc64).  Built
for iSeries (ARCH=powerpc).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 27515476ad6c2cd2c0d0469188a61b02c356d837..e7ca5b1f591e2977dd5d2162747086400b82a4f1 100644 (file)
--- 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 \
 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/arch/ppc64/kernel/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
similarity index 100%
rename from arch/ppc64/kernel/scanlog.c
rename to arch/powerpc/platforms/pseries/scanlog.c

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 1f71f23cc26d230b79787775a2720c71ce114db4..048ba910f028b98940f8b8b1316e665ad4be26d5 100644 (file)
--- a/arch/ppc64/kernel/Makefile
+++ b/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)