diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /arch/um/include/kern.h | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 *); |