Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6

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

diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 17a4da65e275f99930ca6664a89ab28424f919cd..ca020130086820b6e21956f4fc10b0d5ebf58d33 100644 (file)
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -13,7 +13,6 @@ extra-$(CONFIG_POWER4)                += idle_power4.o
 extra-y                                += vmlinux.lds
 
 obj-y                          := entry.o traps.o idle.o time.o misc.o \
-                                       process.o align.o \
                                        setup.o \
                                        ppc_htab.o
 obj-$(CONFIG_6xx)              += l2cr.o cpu_setup_6xx.o
@@ -38,7 +37,7 @@ endif
 # These are here while we do the architecture merge
 
 else
-obj-y                          := idle.o align.o
+obj-y                          := idle.o
 obj-$(CONFIG_6xx)              += l2cr.o cpu_setup_6xx.o
 obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
 obj-$(CONFIG_MODULES)          += module.o
@@ -49,5 +48,4 @@ obj-$(CONFIG_TAU)             += temp.o
 ifndef CONFIG_E200
 obj-$(CONFIG_FSL_BOOKE)                += perfmon_fsl_booke.o
 endif
-obj-$(CONFIG_KEXEC)            += machine_kexec.o relocate_kernel.o
 endif