Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / arch / um / include / um_malloc.h

diff --git a/arch/um/include/um_malloc.h b/arch/um/include/um_malloc.h
index 0363a9b53f8da33dad61a4245b592295e2b85e88..e6d7c5aa3f4e26202e70e5fd2b325adcff03dbfa 100644 (file)
--- a/arch/um/include/um_malloc.h
+++ b/arch/um/include/um_malloc.h
@@ -11,7 +11,6 @@ extern void *um_kmalloc_atomic(int size);
 extern void kfree(const void *ptr);
 
 extern void *um_vmalloc(int size);
-extern void *um_vmalloc_atomic(int size);
 extern void vfree(void *ptr);
 
 #endif /* __UM_MALLOC_H__ */