git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
cpu
/
mtrr
/
cyrix.c
diff --git
a/arch/i386/kernel/cpu/mtrr/cyrix.c
b/arch/i386/kernel/cpu/mtrr/cyrix.c
index
1001f1e
..
2287d48
100644
(file)
--- a/
arch/i386/kernel/cpu/mtrr/cyrix.c
+++ b/
arch/i386/kernel/cpu/mtrr/cyrix.c
@@
-3,6
+3,7
@@
#include <asm/mtrr.h>
#include <asm/msr.h>
#include <asm/io.h>
+#include <asm/processor-cyrix.h>
#include "mtrr.h"
int arr3_protected;