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 branch 'topic/asoc' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
pci-nommu.c
diff --git
a/arch/x86/kernel/pci-nommu.c
b/arch/x86/kernel/pci-nommu.c
index 22be12b60a8ff2b12678e5198379d19260de9ce4..3af4af810c07947d9a697444f3010bf2d5427e45 100644
(file)
--- a/
arch/x86/kernel/pci-nommu.c
+++ b/
arch/x86/kernel/pci-nommu.c
@@
-4,6
+4,7
@@
#include <linux/scatterlist.h>
#include <linux/string.h>
#include <linux/init.h>
+#include <linux/gfp.h>
#include <linux/pci.h>
#include <linux/mm.h>