diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:12:36 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 16:12:36 -0400 |
| commit | 2fca877b68b2b4fc5b94277858a1bedd46017cde (patch) | |
| tree | fd02725406299ba2f26354463b3c261721e9eb6b /include/asm-x86_64/io.h | |
| parent | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (diff) | |
| parent | 02b3e4e2d71b6058ec11cc01c72ac651eb3ded2b (diff) | |
/spare/repo/libata-dev branch 'v2.6.13'
Diffstat (limited to 'include/asm-x86_64/io.h')
| -rw-r--r-- | include/asm-x86_64/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h index 94202703fae2..37fc3f149a5a 100644 --- a/include/asm-x86_64/io.h +++ b/include/asm-x86_64/io.h | |||
| @@ -124,12 +124,7 @@ extern inline void * phys_to_virt(unsigned long address) | |||
| 124 | /* | 124 | /* |
| 125 | * Change "struct page" to physical address. | 125 | * Change "struct page" to physical address. |
| 126 | */ | 126 | */ |
| 127 | #ifdef CONFIG_DISCONTIGMEM | ||
| 128 | #include <asm/mmzone.h> | ||
| 129 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | 127 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) |
| 130 | #else | ||
| 131 | #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) | ||
| 132 | #endif | ||
| 133 | 128 | ||
| 134 | #include <asm-generic/iomap.h> | 129 | #include <asm-generic/iomap.h> |
| 135 | 130 | ||