projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/boot, to resolve conflict
[linux-2.6-microblaze.git]
/
arch
/
x86
/
include
/
asm
/
asm-prototypes.h
diff --git
a/arch/x86/include/asm/asm-prototypes.h
b/arch/x86/include/asm/asm-prototypes.h
index
b1a98fa
..
076bf8d
100644
(file)
--- a/
arch/x86/include/asm/asm-prototypes.h
+++ b/
arch/x86/include/asm/asm-prototypes.h
@@
-12,6
+12,7
@@
#include <asm/special_insns.h>
#include <asm/preempt.h>
#include <asm/asm.h>
+#include <asm/fred.h>
#include <asm/gsseg.h>
#ifndef CONFIG_X86_CMPXCHG64