diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:18:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 12:06:53 -0400 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/io.h | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 688f8a4085a4..72b7719523bf 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 |