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_64.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_64.h')
-rw-r--r-- | include/asm-x86/io_64.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h index f436532f1935..64429e9431a8 100644 --- 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); | |||
235 | 235 | ||
236 | #define flush_write_buffers() | 236 | #define flush_write_buffers() |
237 | 237 | ||
238 | extern int iommu_bio_merge; | ||
239 | #define BIO_VMERGE_BOUNDARY iommu_bio_merge | 238 | #define BIO_VMERGE_BOUNDARY iommu_bio_merge |
240 | 239 | ||
241 | /* | 240 | /* |