diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:33 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:33 -0400 |
commit | 48cf937f48f68bd1e61f37c6357dbff5adb95532 (patch) | |
tree | d9e2368a419adc2c11691be2842c66213bec5a42 /arch/um/os-Linux/helper.c | |
parent | fce39665abb71d01d74ac74eb13dd69a799dfc2f (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into x86/i8259
Diffstat (limited to 'arch/um/os-Linux/helper.c')
-rw-r--r-- | arch/um/os-Linux/helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index 74ca7aabf4e1..30860b89ec58 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <unistd.h> | 7 | #include <unistd.h> |
8 | #include <errno.h> | 8 | #include <errno.h> |
9 | #include <sched.h> | 9 | #include <sched.h> |
10 | #include <linux/limits.h> | ||
10 | #include <sys/socket.h> | 11 | #include <sys/socket.h> |
11 | #include <sys/wait.h> | 12 | #include <sys/wait.h> |
12 | #include "kern_constants.h" | 13 | #include "kern_constants.h" |