projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[cascardo/linux.git]
/
include
/
asm-mips
/
hazards.h
diff --git
a/include/asm-mips/hazards.h
b/include/asm-mips/hazards.h
index
feb29a7
..
66943c4
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__
@@
-284,6
+283,8
@@
do { \
#define instruction_hazard() do { } while (0)
#endif
#define instruction_hazard() do { } while (0)
#endif
+extern void mips_ihb(void);
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_HAZARDS_H */
#endif /* __ASSEMBLY__ */
#endif /* _ASM_HAZARDS_H */