Merge branch 'linus' into x86/urgent

[linux-2.6-omap-h63xx.git] / arch / x86 / math-emu / Makefile

diff --git a/arch/x86/math-emu/Makefile b/arch/x86/math-emu/Makefile
index 9c943fa6ce6b857e7b23bff8b8f43b5748fbb7b3..9b0c63b6030296defe20d5035b4feedf344b251c 100644 (file)
--- a/arch/x86/math-emu/Makefile
+++ b/arch/x86/math-emu/Makefile
@@ -5,8 +5,7 @@
 #DEBUG = -DDEBUGGING
 DEBUG  =
 PARANOID = -DPARANOID
-CFLAGS := $(CFLAGS) $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION)
-
+EXTRA_CFLAGS   := $(PARANOID) $(DEBUG) -fno-builtin $(MATH_EMULATION)
 EXTRA_AFLAGS   := $(PARANOID)
 
 # From 'C' language sources: