diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-19 00:42:13 -0400 |
| commit | 4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch) | |
| tree | e1bef4c3db854bb10fd13dc67415d77b5d999533 /include/asm-i386/signal.h | |
| parent | fea63e38013ec628ab3f7fddc4c2148064b7910a (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-i386/signal.h')
| -rw-r--r-- | include/asm-i386/signal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h index 3824a502351f..c3e8adec5918 100644 --- a/include/asm-i386/signal.h +++ b/include/asm-i386/signal.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define _ASMi386_SIGNAL_H | 2 | #define _ASMi386_SIGNAL_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/linkage.h> | ||
| 6 | #include <linux/time.h> | 5 | #include <linux/time.h> |
| 7 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
| 8 | 7 | ||
| @@ -10,6 +9,9 @@ | |||
| 10 | struct siginfo; | 9 | struct siginfo; |
| 11 | 10 | ||
| 12 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 12 | |||
| 13 | #include <linux/linkage.h> | ||
| 14 | |||
| 13 | /* Most things should be clean enough to redefine this at will, if care | 15 | /* Most things should be clean enough to redefine this at will, if care |
| 14 | is taken to make libc match. */ | 16 | is taken to make libc match. */ |
| 15 | 17 | ||