Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

Fix up some trivial conflicts in {i386|ia64}/Makefile

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 57b047c27e46..f722e1a25948 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -25,7 +25,6 @@ cflags-y	:= -pipe $(EXTRA) -ffixed-r13 -mfixed-range=f12-f15,f32-f127 \
                    -falign-functions=32 -frename-registers -fno-optimize-sibling-calls
 CFLAGS_KERNEL   := -mconstant-gp
 
-GCC_VERSION     := $(call cc-version)
 GAS_STATUS      = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)")
 CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)")
 
@@ -37,7 +36,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from
                 ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
 endif
 
-ifeq ($(GCC_VERSION),0304)
+ifeq ($(call cc-version),0304)
         cflags-$(CONFIG_ITANIUM)        += -mtune=merced
         cflags-$(CONFIG_MCKINLEY)       += -mtune=mckinley
 endif