Merge branch 'for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge

[linux-2.6] / arch / parisc / Makefile

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 760567a9ba16e55e78b9def374a940bf65a74785..f3d0d7c7097782bb43bf2e93d5e0eead251274bc 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -63,7 +63,7 @@ cflags-$(CONFIG_PA8X00)               += -march=2.0 -mschedule=8000
 
 head-y                 := arch/parisc/kernel/head.o 
 
-CFLAGS += $(cflags-y)
+KBUILD_CFLAGS  += $(cflags-y)
 
 kernel-y                       := mm/ kernel/ math-emu/ kernel/init_task.o
 kernel-$(CONFIG_HPUX)          += hpux/