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 branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
[sfrench/cifs-2.6.git]
/
include
/
asm-x86
/
io.h
diff --git
a/include/asm-x86/io.h
b/include/asm-x86/io.h
index 1b75a43bb6cecf505e3e895b33423ecf1c2c908e..25417d6c5c6216efc406f41cc625a2137db17f60 100644
(file)
--- a/
include/asm-x86/io.h
+++ b/
include/asm-x86/io.h
@@
-73,6
+73,8
@@
build_mmio_write(__writeq, "q", unsigned long, "r", )
#define writeq writeq
#endif
+extern int iommu_bio_merge;
+
#ifdef CONFIG_X86_32
# include "io_32.h"
#else