Merge branch 'linus' into locking-for-linus

[sfrench/cifs-2.6.git] / arch / powerpc / math-emu / Makefile

diff --git a/arch/powerpc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile
index f9e506a735ae2e0d833bb0d0197b7d323679a67c..0c16ab947f1f3f04990874562b604209012c60dc 100644 (file)
--- a/arch/powerpc/math-emu/Makefile
+++ b/arch/powerpc/math-emu/Makefile
@@ -1,6 +1,4 @@
 
-obj-y                          := math.o fmr.o lfd.o stfd.o
-
 obj-$(CONFIG_MATH_EMULATION)   += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
                                        fctiw.o fctiwz.o fdiv.o fdivs.o \
                                        fmadd.o fmadds.o fmsub.o fmsubs.o \
@@ -9,7 +7,8 @@ obj-$(CONFIG_MATH_EMULATION)    += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
                                        fres.o frsp.o frsqrte.o fsel.o lfs.o \
                                        fsqrt.o fsqrts.o fsub.o fsubs.o \
                                        mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
-                                       mtfsf.o mtfsfi.o stfiwx.o stfs.o
+                                       mtfsf.o mtfsfi.o stfiwx.o stfs.o \
+                                       math.o fmr.o lfd.o stfd.o
 
 obj-$(CONFIG_SPE)              += math_efp.o