Merge /spare/repo/linux-2.6/

[cascardo/linux.git] / include / asm-um / page.h

diff --git a/include/asm-um/page.h b/include/asm-um/page.h
index bd850a2..2c192ab 100644 (file)
--- a/include/asm-um/page.h
+++ b/include/asm-um/page.h
@@ -96,8 +96,7 @@ extern unsigned long uml_physmem;
 
 #define __va_space (8*1024*1024)
 
-extern unsigned long to_phys(void *virt);
-extern void *to_virt(unsigned long phys);
+#include "mem.h"
 
 /* Cast to unsigned long before casting to void * to avoid a warning from
  * mmap_kmem about cutting a long long down to a void *.  Not sure that