summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 09:12:58 +0200
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 09:12:58 +0200
commite766f1cc596078b1603ac2c96617660c4c7e2d81 (patch)
tree86f24a621dbe39fd25dcec539c2f969f50bfbcab /include/asm-sparc
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[SPARC32]: More dependencies fallout (diff)
downloadlinux-e766f1cc596078b1603ac2c96617660c4c7e2d81.tar.xz
linux-e766f1cc596078b1603ac2c96617660c4c7e2d81.zip
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.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index 40ed30a2b7c6..8f4f6a959651 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);