---

yaml --- r: 156650 b: refs/heads/master c: bf2a4c7 h: refs/heads/master v: v3
git-mirror · Aug 11, 2009 · 8e6fd31 · 8e6fd31
1 parent 6e4529e
commit 8e6fd31
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5a8879347bbe68bd24c8870503bf6a0362da26b
+refs/heads/master: bf2a4c7270b9a22243a91ab5efcc47aaf997c66b
diff --git a/trunk/arch/ia64/Makefile b/trunk/arch/ia64/Makefile
@@ -41,11 +41,6 @@ $(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 ($(call cc-version),0304)
-	cflags-$(CONFIG_ITANIUM)	+= -mtune=merced
-	cflags-$(CONFIG_MCKINLEY)	+= -mtune=mckinley
-endif
-
 KBUILD_CFLAGS += $(cflags-y)
 head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o