diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 23:38:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 23:38:58 -0400 |
| commit | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (patch) | |
| tree | 16fbe6ba431bcf949ee8645510b0c2fd39b5810f /include/asm-x86_64/io.h | |
| parent | 66b04a80eea60cabf9d89fd34deb3234a740052f (diff) | |
| parent | 020f46a39eb7b99a575b9f4d105fce2b142acdf1 (diff) | |
| download | linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.tar.gz linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.tar.bz2 linux-5696c1944a33b4434a9a1ebb6383b906afd43a10.zip | |
Merge /spare/repo/linux-2.6/
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) /* * Change "struct page" to physical address. */ -#ifdef CONFIG_DISCONTIGMEM -#include <asm/mmzone.h> #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) -#else -#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) -#endif #include <asm-generic/iomap.h> |