Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

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

diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index d1004b4d942fce7d75daccf7d6ea641bce233f0b..4e1a8e2c45410746b0b8176c6356068f433a8be2 100644 (file)
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -14,13 +14,13 @@ LDFLAGS_vmlinux     := -static -N #-relax
 CHECKFLAGS     += -D__alpha__ -m64
 cflags-y       := -pipe -mno-fp-regs -ffixed-8 -msmall-data
 
-cpuflags-$(CONFIG_ALPHA_EV67)          := -mcpu=ev67
-cpuflags-$(CONFIG_ALPHA_EV6)           := -mcpu=ev6
+cpuflags-$(CONFIG_ALPHA_EV4)           := -mcpu=ev4
+cpuflags-$(CONFIG_ALPHA_EV5)           := -mcpu=ev5
+cpuflags-$(CONFIG_ALPHA_EV56)          := -mcpu=ev56
 cpuflags-$(CONFIG_ALPHA_POLARIS)       := -mcpu=pca56
 cpuflags-$(CONFIG_ALPHA_SX164)         := -mcpu=pca56
-cpuflags-$(CONFIG_ALPHA_EV56)          := -mcpu=ev56
-cpuflags-$(CONFIG_ALPHA_EV5)           := -mcpu=ev5
-cpuflags-$(CONFIG_ALPHA_EV4)           := -mcpu=ev4
+cpuflags-$(CONFIG_ALPHA_EV6)           := -mcpu=ev6
+cpuflags-$(CONFIG_ALPHA_EV67)          := -mcpu=ev67
 # If GENERIC, make sure to turn off any instruction set extensions that
 # the host compiler might have on by default.  Given that EV4 and EV5
 # have the same instruction set, prefer EV5 because an EV5 schedule is
@@ -33,7 +33,7 @@ cflags-y                              += $(cpuflags-y)
 # For TSUNAMI, we must have the assembler not emulate our instructions.
 # The same is true for IRONGATE, POLARIS, PYXIS.
 # BWX is most important, but we don't really want any emulation ever.
-CFLAGS += $(cflags-y) -Wa,-mev6
+KBUILD_CFLAGS += $(cflags-y) -Wa,-mev6
 
 head-y := arch/alpha/kernel/head.o