projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus...
[cascardo/linux.git]
/
include
/
asm-x86
/
io_64.h
diff --git
a/include/asm-x86/io_64.h
b/include/asm-x86/io_64.h
index
f436532
..
64429e9
100644
(file)
--- a/
include/asm-x86/io_64.h
+++ b/
include/asm-x86/io_64.h
@@
-235,7
+235,6
@@
void memset_io(volatile void __iomem *a, int b, size_t c);
#define flush_write_buffers()
-extern int iommu_bio_merge;
#define BIO_VMERGE_BOUNDARY iommu_bio_merge
/*