summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel/Makefile
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-27 10:28:58 +0200
committerPaul Mackerras <paulus@samba.org>2006-03-27 10:28:58 +0200
commited981856ca8af30912fd61a6a4ac8d30a453a5ec (patch)
tree7297090fc4c5445422be9a1f86e95c2e899881b1 /arch/ppc/kernel/Makefile
parentpowerpc: Move swsusp.S over to arch/powerpc (diff)
downloadlinux-ed981856ca8af30912fd61a6a4ac8d30a453a5ec.tar.xz
linux-ed981856ca8af30912fd61a6a4ac8d30a453a5ec.zip
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>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
-rw-r--r--arch/ppc/kernel/Makefile3
1 files changed, 1 insertions, 2 deletions
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