diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /arch/um/include/kern.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
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); | |||
| 29 | extern int getgid(void); | 29 | extern int getgid(void); |
| 30 | extern int pause(void); | 30 | extern int pause(void); |
| 31 | extern int write(int, const void *, int); | 31 | extern int write(int, const void *, int); |
| 32 | extern int exit(int); | 32 | extern void exit(int); |
| 33 | extern int close(int); | 33 | extern int close(int); |
| 34 | extern int read(unsigned int, char *, int); | 34 | extern int read(unsigned int, char *, int); |
| 35 | extern int pipe(int *); | 35 | extern int pipe(int *); |