diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:12:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 00:12:58 -0700 |
| commit | e766f1cc596078b1603ac2c96617660c4c7e2d81 (patch) | |
| tree | 86f24a621dbe39fd25dcec539c2f969f50bfbcab /include/asm-sparc | |
| parent | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (diff) | |
| parent | ebede60741e2cec6d210f137fd22a30e37abc0be (diff) | |
| download | op-kernel-dev-e766f1cc596078b1603ac2c96617660c4c7e2d81.zip op-kernel-dev-e766f1cc596078b1603ac2c96617660c4c7e2d81.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/pgtable.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h index 40ed30a..8f4f6a9 100644 --- a/include/asm-sparc/pgtable.h +++ b/include/asm-sparc/pgtable.h @@ -435,9 +435,6 @@ extern unsigned long *sparc_valid_addr_bitmap; #define kern_addr_valid(addr) \ (test_bit(__pa((unsigned long)(addr))>>20, sparc_valid_addr_bitmap)) -extern int io_remap_page_range(struct vm_area_struct *vma, - unsigned long from, unsigned long to, - unsigned long size, pgprot_t prot, int space); extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot); |
