git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-mips
/
hazards.h
diff --git
a/include/asm-mips/hazards.h
b/include/asm-mips/hazards.h
index
dadc051
..
25f5e8a
100644
(file)
--- a/
include/asm-mips/hazards.h
+++ b/
include/asm-mips/hazards.h
@@
-10,7
+10,6
@@
#ifndef _ASM_HAZARDS_H
#define _ASM_HAZARDS_H
#ifndef _ASM_HAZARDS_H
#define _ASM_HAZARDS_H
-#include <linux/config.h>
#ifdef __ASSEMBLY__
#ifdef __ASSEMBLY__
@@
-70,10
+69,10
@@
* Use a macro for ehb unless explicit support for MIPSR2 is enabled
*/
* Use a macro for ehb unless explicit support for MIPSR2 is enabled
*/
-#define irq_enable_hazard
+#define irq_enable_hazard
\
_ehb
_ehb
-#define irq_disable_hazard
+#define irq_disable_hazard
\
_ehb
#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
_ehb
#elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)