diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/um/kernel/sigio_user.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/um/kernel/sigio_user.c')
| -rw-r--r-- | arch/um/kernel/sigio_user.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c index 48b1f644b9a6..62e5cfdf2188 100644 --- a/arch/um/kernel/sigio_user.c +++ b/arch/um/kernel/sigio_user.c | |||
| @@ -216,6 +216,8 @@ static int write_sigio_thread(void *unused) | |||
| 216 | "err = %d\n", -n); | 216 | "err = %d\n", -n); |
| 217 | } | 217 | } |
| 218 | } | 218 | } |
| 219 | |||
| 220 | return 0; | ||
| 219 | } | 221 | } |
| 220 | 222 | ||
| 221 | static int need_poll(int n) | 223 | static int need_poll(int n) |