[ARM] Merge AT91 and devel branches

[mv-sheeva.git] / arch / um / include / user_util.h

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 802d7842514d25ad63b5be204a573363a6992b60..06625fefef3387b2aac94471361cf59139042b34 100644 (file)
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -52,7 +52,6 @@ extern int linux_main(int argc, char **argv);
 extern void set_cmdline(char *cmd);
 extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
 extern int get_pty(void);
-extern void *um_kmalloc(int size);
 extern int switcheroo(int fd, int prot, void *from, void *to, int size);
 extern void do_exec(int old_pid, int new_pid);
 extern void tracer_panic(char *msg, ...)