Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

[sfrench/cifs-2.6.git] / include / asm-x86 / io_64.h

diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index f436532f1935094b4dff25b8ce766aa1d5c72998..64429e9431a8aef1089c25c8c00c18b64cd93663 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
 
 /*