git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc6'
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
module.c
diff --git
a/arch/x86/kernel/module.c
b/arch/x86/kernel/module.c
index 89f386f044e43fa4ed4d29503bfc838900e3841c..e0bc186d7501f123265ae288ae071e772016e89b 100644
(file)
--- a/
arch/x86/kernel/module.c
+++ b/
arch/x86/kernel/module.c
@@
-23,6
+23,7
@@
#include <linux/kernel.h>
#include <linux/bug.h>
#include <linux/mm.h>
+#include <linux/gfp.h>
#include <asm/system.h>
#include <asm/page.h>