diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-x86_64/io.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
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 | ||