Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / kernel / Makefile

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 2531070..466437f 100644 (file)
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -1,31 +1,24 @@
 #
 # Makefile for the linux kernel.
 #
-
 extra-$(CONFIG_PPC_STD_MMU)    := head.o
 extra-$(CONFIG_40x)            := head_4xx.o
 extra-$(CONFIG_44x)            := head_44x.o
-extra-$(CONFIG_E500)           := head_e500.o
+extra-$(CONFIG_FSL_BOOKE)      := head_fsl_booke.o
 extra-$(CONFIG_8xx)            := head_8xx.o
-extra-$(CONFIG_6xx)            += idle_6xx.o
-extra-$(CONFIG_POWER4)         += idle_power4.o
-extra-y                                += vmlinux.lds.s
+extra-y                                += vmlinux.lds
 
-obj-y                          := entry.o traps.o irq.o idle.o time.o misc.o \
-                                       process.o signal.o ptrace.o align.o \
-                                       semaphore.o syscalls.o setup.o \
-                                       cputable.o ppc_htab.o
-obj-$(CONFIG_6xx)              += l2cr.o cpu_setup_6xx.o
-obj-$(CONFIG_POWER4)           += cpu_setup_power4.o
-obj-$(CONFIG_MODULES)          += module.o ppc_ksyms.o
+obj-y                          := entry.o traps.o time.o misc.o \
+                                       setup.o \
+                                       ppc_htab.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
 obj-$(CONFIG_KGDB)             += ppc-stub.o
 obj-$(CONFIG_SMP)              += smp.o smp-tbsync.o
-obj-$(CONFIG_TAU)              += temp.o
-obj-$(CONFIG_ALTIVEC)          += vecemu.o vector.o
+obj-$(CONFIG_KEXEC)            += machine_kexec.o relocate_kernel.o
 
-ifdef CONFIG_MATH_EMULATION
+ifndef CONFIG_MATH_EMULATION
 obj-$(CONFIG_8xx)              += softemu8xx.o
 endif
-