projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
xen
/
biomerge.c
diff --git
a/drivers/xen/biomerge.c
b/drivers/xen/biomerge.c
index
18c1bb6
..
0edb91c
100644
(file)
--- a/
drivers/xen/biomerge.c
+++ b/
drivers/xen/biomerge.c
@@
-1,5
+1,6
@@
#include <linux/bio.h>
#include <linux/io.h>
+#include <linux/export.h>
#include <xen/page.h>
bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,