Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[sfrench/cifs-2.6.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a29e64175f8f10c92c9e4d83d33cacdc0efcafc9..2a0b2c8a1fe00df55a7dd87092d4ce3661399cfe 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -59,6 +59,8 @@ tune-$(CONFIG_CPU_ARM7TDMI)   :=-mtune=arm7tdmi
 tune-$(CONFIG_CPU_ARM720T)     :=-mtune=arm7tdmi
 tune-$(CONFIG_CPU_ARM740T)     :=-mtune=arm7tdmi
 tune-$(CONFIG_CPU_ARM9TDMI)    :=-mtune=arm9tdmi
+tune-$(CONFIG_CPU_ARM940T)     :=-mtune=arm9tdmi
+tune-$(CONFIG_CPU_ARM946T)     :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
 tune-$(CONFIG_CPU_ARM920T)     :=-mtune=arm9tdmi
 tune-$(CONFIG_CPU_ARM922T)     :=-mtune=arm9tdmi
 tune-$(CONFIG_CPU_ARM925T)     :=-mtune=arm9tdmi