diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /include/asm-i386/pgtable.h | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-i386/pgtable.h')
| -rw-r--r-- | include/asm-i386/pgtable.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index 47bc1ffa3d4c..d101ac414f07 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h | |||
| @@ -431,9 +431,6 @@ extern void noexec_setup(const char *str); | |||
| 431 | #define kern_addr_valid(addr) (1) | 431 | #define kern_addr_valid(addr) (1) |
| 432 | #endif /* CONFIG_FLATMEM */ | 432 | #endif /* CONFIG_FLATMEM */ |
| 433 | 433 | ||
| 434 | #define io_remap_page_range(vma, vaddr, paddr, size, prot) \ | ||
| 435 | remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot) | ||
| 436 | |||
| 437 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | 434 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ |
| 438 | remap_pfn_range(vma, vaddr, pfn, size, prot) | 435 | remap_pfn_range(vma, vaddr, pfn, size, prot) |
| 439 | 436 | ||