diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-x86_64/siginfo.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-x86_64/siginfo.h')
| -rw-r--r-- | include/asm-x86_64/siginfo.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/siginfo.h b/include/asm-x86_64/siginfo.h index 7bc15985f124..d09a1e6e7246 100644 --- a/include/asm-x86_64/siginfo.h +++ b/include/asm-x86_64/siginfo.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) | 4 | #define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int)) |
| 5 | 5 | ||
| 6 | #define SIGEV_PAD_SIZE ((SIGEV_MAX_SIZE/sizeof(int)) - 4) | ||
| 7 | |||
| 8 | #include <asm-generic/siginfo.h> | 6 | #include <asm-generic/siginfo.h> |
| 9 | 7 | ||
| 10 | #endif | 8 | #endif |