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 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
xen
/
swiotlb-xen.c
diff --git
a/drivers/xen/swiotlb-xen.c
b/drivers/xen/swiotlb-xen.c
index 82fc54f8eb77234253dae40572a817231bdd57b0..5bb72d3f8337c742b4bdb068d84cddf2b4156a7e 100644
(file)
--- a/
drivers/xen/swiotlb-xen.c
+++ b/
drivers/xen/swiotlb-xen.c
@@
-36,7
+36,7
@@
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
#include <linux/bootmem.h>
-#include <linux/dma-
mapping
.h>
+#include <linux/dma-
direct
.h>
#include <linux/export.h>
#include <xen/swiotlb-xen.h>
#include <xen/page.h>