diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 14:27:27 +0100 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-x86_64/io.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
| download | op-kernel-dev-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.zip op-kernel-dev-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.gz | |
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 9420270..37fc3f1 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> |
