commit 9321b8cbbbf3a8dbd4748e3722facaeb8401bd13
author Jaswinder Singh <jaswinder@infradead.org> Mon Jul 21 22:24:29 2008 +0530
committer Ingo Molnar <mingo@elte.hu> Tue Jul 22 14:36:04 2008 +0200
tree acc231d54b0b8746db5d3c15116568c2208f4618
parent a7b7511ac1404eaf0e7b6c445a7c61b48ccfcf0b

x86: pci-dma.c declare iommu_bio_merge before they get used

moved iommu_bio_merge from io_64.h to io.h because it is required for both.

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>

include/asm-x86/io.h

diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index bf5d629..a145210 100644
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
@@ -73,6 +73,8 @@
 #define writeq writeq
 #endif
 
+extern int iommu_bio_merge;
+
 #ifdef CONFIG_X86_32
 # include "io_32.h"
 #else

include/asm-x86/io_64.h

diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index ddd8058..1e27137 100644
--- a/include/asm-x86/io_64.h
+++ b/include/asm-x86/io_64.h
@@ -233,7 +233,6 @@
 
 #define flush_write_buffers()
 
-extern int iommu_bio_merge;
 #define BIO_VMERGE_BOUNDARY iommu_bio_merge
 
 /*