diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/um/include/kern.h | |
| parent | [PATCH] powerpc: Kill _machine and hard-coded platform numbers (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz linux-bac30d1a78d0f11c613968fc8b351a91ed465386.zip | |
Merge ../linux-2.6
Diffstat (limited to 'arch/um/include/kern.h')
| -rw-r--r-- | arch/um/include/kern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/kern.h b/arch/um/include/kern.h index 7d223beccbc0..4ce3fc650e57 100644 --- 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 *); |