From 7e29bfbece05fcd1783bb6d782b143c61197ca06 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Thu, 10 Nov 2011 22:30:25 -0800 Subject: [PATCH] --- yaml --- r: 284752 b: refs/heads/master c: 15fb0a150938ad68561bab6aa895685665bef08c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/hazards.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 19f03713959d..4993c139ad80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bbb6c1b7b6c4dffd0d5ff8787691e0ea4c6a796 +refs/heads/master: 15fb0a150938ad68561bab6aa895685665bef08c diff --git a/trunk/arch/mips/include/asm/hazards.h b/trunk/arch/mips/include/asm/hazards.h index 4e332165d7b7..8f630e495532 100644 --- a/trunk/arch/mips/include/asm/hazards.h +++ b/trunk/arch/mips/include/asm/hazards.h @@ -139,8 +139,8 @@ do { \ } while (0) #elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \ - defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \ - defined(CONFIG_CPU_R5500) + defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \ + defined(CONFIG_CPU_R5500) /* * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.