Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6

[powerpc.git] / arch / ppc / Makefile

diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 73cbdda..f9b0d77 100644 (file)
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -29,7 +29,7 @@ CPP           = $(CC) -E $(CFLAGS)
 
 CHECKFLAGS     += -D__powerpc__
 
-ifndef CONFIG_E500
+ifndef CONFIG_FSL_BOOKE
 CFLAGS         += -mstring
 endif
 
@@ -38,6 +38,7 @@ cpu-as-$(CONFIG_4xx)          += -Wa,-m405
 cpu-as-$(CONFIG_6xx)           += -Wa,-maltivec
 cpu-as-$(CONFIG_POWER4)                += -Wa,-maltivec
 cpu-as-$(CONFIG_E500)          += -Wa,-me500
+cpu-as-$(CONFIG_E200)          += -Wa,-me200
 
 AFLAGS += $(cpu-as-y)
 CFLAGS += $(cpu-as-y)
@@ -53,6 +54,7 @@ head-$(CONFIG_FSL_BOOKE)      := arch/ppc/kernel/head_fsl_booke.o
 
 head-$(CONFIG_6xx)             += arch/ppc/kernel/idle_6xx.o
 head-$(CONFIG_POWER4)          += arch/ppc/kernel/idle_power4.o
+head-$(CONFIG_PPC_FPU)         += arch/ppc/kernel/fpu.o
 
 core-y                         += arch/ppc/kernel/ arch/ppc/platforms/ \
                                   arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/