Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / arch / um / include / kern.h

diff --git a/arch/um/include/kern.h b/arch/um/include/kern.h
index 7d223beccbc0cfb0e0a01e7a4de24bbed538f0a4..4ce3fc650e573b823ee7e17bb0b5c21a242a8845 100644 (file)
--- a/arch/um/include/kern.h
+++ b/arch/um/include/kern.h
@@ -29,7 +29,7 @@ extern int getuid(void);
 extern int getgid(void);
 extern int pause(void);
 extern int write(int, const void *, int);
-extern int exit(int);
+extern void exit(int);
 extern int close(int);
 extern int read(unsigned int, char *, int);
 extern int pipe(int *);