aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/kernel/Makefile3
-rw-r--r--arch/powerpc/kernel/module_32.c (renamed from arch/ppc/kernel/module.c)0
-rw-r--r--arch/ppc/kernel/Makefile3
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
36obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 36obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
37obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o 37obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
38obj-$(CONFIG_TAU) += tau_6xx.o 38obj-$(CONFIG_TAU) += tau_6xx.o
39obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
40obj32-$(CONFIG_MODULES) += module_32.o
39 41
40ifeq ($(CONFIG_PPC_MERGE),y) 42ifeq ($(CONFIG_PPC_MERGE),y)
41 43
@@ -78,6 +80,7 @@ smpobj-$(CONFIG_SMP) += smp.o
78 80
79endif 81endif
80 82
83obj-$(CONFIG_PPC32) += $(obj32-y)
81obj-$(CONFIG_PPC64) += $(obj64-y) 84obj-$(CONFIG_PPC64) += $(obj64-y)
82 85
83extra-$(CONFIG_PPC_FPU) += fpu.o 86extra-$(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
13obj-y := entry.o traps.o time.o misc.o \ 13obj-y := entry.o traps.o time.o misc.o \
14 setup.o \ 14 setup.o \
15 ppc_htab.o 15 ppc_htab.o
16obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o 16obj-$(CONFIG_MODULES) += ppc_ksyms.o
17obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 17obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
18obj-$(CONFIG_PCI) += pci.o 18obj-$(CONFIG_PCI) += pci.o
19obj-$(CONFIG_RAPIDIO) += rio.o 19obj-$(CONFIG_RAPIDIO) += rio.o
@@ -31,7 +31,6 @@ endif
31# These are here while we do the architecture merge 31# These are here while we do the architecture merge
32 32
33else 33else
34obj-$(CONFIG_MODULES) += module.o
35obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o 34obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
36obj-$(CONFIG_KGDB) += ppc-stub.o 35obj-$(CONFIG_KGDB) += ppc-stub.o
37ifndef CONFIG_E200 36ifndef CONFIG_E200