linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-mips / hazards.h

diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index 25f5e8a..feb29a7 100644 (file)
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -10,6 +10,7 @@
 #ifndef _ASM_HAZARDS_H
 #define _ASM_HAZARDS_H
 
+#include <linux/config.h>
 
 #ifdef __ASSEMBLY__
 
@@ -69,10 +70,10 @@
  * Use a macro for ehb unless explicit support for MIPSR2 is enabled
  */
 
-#define irq_enable_hazard                                              \
+#define irq_enable_hazard
        _ehb
 
-#define irq_disable_hazard                                             \
+#define irq_disable_hazard
        _ehb
 
 #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
@@ -283,8 +284,6 @@ do {                                                                        \
 #define instruction_hazard() do { } while (0)
 #endif
 
-extern void mips_ihb(void);
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_HAZARDS_H */