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 commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
arch
/
x86
/
platform
/
uv
/
tlb_uv.c
diff --git
a/arch/x86/platform/uv/tlb_uv.c
b/arch/x86/platform/uv/tlb_uv.c
index
a7b38d3
..
7cb6424
100644
(file)
--- a/
arch/x86/platform/uv/tlb_uv.c
+++ b/
arch/x86/platform/uv/tlb_uv.c
@@
-11,6
+11,7
@@
#include <linux/debugfs.h>
#include <linux/kernel.h>
#include <linux/slab.h>
+#include <linux/delay.h>
#include <asm/mmu_context.h>
#include <asm/uv/uv.h>