diff options
| author | Jaswinder Singh <jaswinder@infradead.org> | 2008-07-21 12:54:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 08:36:04 -0400 |
| commit | 9321b8cbbbf3a8dbd4748e3722facaeb8401bd13 (patch) | |
| tree | acc231d54b0b8746db5d3c15116568c2208f4618 /include/asm-x86/io.h | |
| parent | a7b7511ac1404eaf0e7b6c445a7c61b48ccfcf0b (diff) | |
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>
Diffstat (limited to 'include/asm-x86/io.h')
| -rw-r--r-- | include/asm-x86/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h index bf5d629b3a39..a145210ac16b 100644 --- a/include/asm-x86/io.h +++ b/include/asm-x86/io.h | |||
| @@ -73,6 +73,8 @@ build_mmio_write(__writeq, "q", unsigned long, "r", ) | |||
| 73 | #define writeq writeq | 73 | #define writeq writeq |
| 74 | #endif | 74 | #endif |
| 75 | 75 | ||
| 76 | extern int iommu_bio_merge; | ||
| 77 | |||
| 76 | #ifdef CONFIG_X86_32 | 78 | #ifdef CONFIG_X86_32 |
| 77 | # include "io_32.h" | 79 | # include "io_32.h" |
| 78 | #else | 80 | #else |