Merge commit 'v2.6.27-rc3' into x86/prototypes

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

diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index 22995c5c5adc0d001bb40730fbeb15d47951ff01..080482acaffc28e934a89a3f5e9f97fe57f3f693 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
 
 /*