diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/x86/include/asm/io_64.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/include/asm/io_64.h')
| -rw-r--r-- | arch/x86/include/asm/io_64.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h index fea325a1122f..563c16270ba6 100644 --- a/arch/x86/include/asm/io_64.h +++ b/arch/x86/include/asm/io_64.h | |||
| @@ -232,8 +232,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c); | |||
| 232 | 232 | ||
| 233 | #define flush_write_buffers() | 233 | #define flush_write_buffers() |
| 234 | 234 | ||
| 235 | #define BIO_VMERGE_BOUNDARY iommu_bio_merge | ||
| 236 | |||
| 237 | /* | 235 | /* |
| 238 | * Convert a virtual cached pointer to an uncached pointer | 236 | * Convert a virtual cached pointer to an uncached pointer |
| 239 | */ | 237 | */ |