Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal

[linux-2.6-omap-h63xx.git] / include / asm-x86 / io.h

diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index 688f8a4085a48e4d000507d8c20605a71a698016..72b7719523bfa9f26efc333ed0efb160ad37d997 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