powerpc: Move module.c over to arch/powerpc

... and rename it to module_32.c since it is the 32-bit version.
The 32-bit and 64-bit ABIs are sufficiently different that having
a merged version isn't really practical.

Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 4 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 754c227835bb..b86d380f01b4 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -36,6 +36,8 @@ obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_6xx)               += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
 obj-$(CONFIG_TAU)               += tau_6xx.o
+obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
+obj32-$(CONFIG_MODULES)         += module_32.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
@@ -78,6 +80,7 @@ smpobj-$(CONFIG_SMP)		+= smp.o
 
 endif
 
+obj-$(CONFIG_PPC32)             += $(obj32-y)
 obj-$(CONFIG_PPC64)             += $(obj64-y)
 
 extra-$(CONFIG_PPC_FPU)         += fpu.o
diff --git a/arch/ppc/kernel/module.c b/arch/powerpc/kernel/module_32.c
index 92f4e5f64f02..92f4e5f64f02 100644
--- a/arch/ppc/kernel/module.c
+++ b/arch/powerpc/kernel/module_32.c
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 8ac1dd958415..e55d7ee17957 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -13,7 +13,7 @@ extra-y				+= vmlinux.lds
 obj-y                           := entry.o traps.o time.o misc.o \
                                         setup.o \
                                         ppc_htab.o
-obj-$(CONFIG_MODULES)           += module.o ppc_ksyms.o
+obj-$(CONFIG_MODULES)           += ppc_ksyms.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-mapping.o
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_RAPIDIO)           += rio.o
@@ -31,7 +31,6 @@ endif
 # These are here while we do the architecture merge
 
 else
-obj-$(CONFIG_MODULES)           += module.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-mapping.o
 obj-$(CONFIG_KGDB)              += ppc-stub.o
 ifndef CONFIG_E200