diff options
| author | Roland Dreier <roland@digitalvampire.org> | 2007-10-15 07:57:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:09 -0400 |
| commit | 217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch) | |
| tree | 1f3ba24177455aeadcf065b9157ccac9252c7cfc /include/asm-x86/sockios.h | |
| parent | 020bd9f1c766ca743556461a70a5b5d559b7e60c (diff) | |
x86: merge some trivially mergeable headers
Merge errno.h, resource.h, rtc.h, sections.h, serial.h and sockios.h,
where i386 and x86_64 have no or only trivial comment/include guard
differences.
Build tested on both 32-bit and 64-bit, and booted on 64-bit.
[tglx: fixup Kbuild as well]
Signed-off-by: Roland Dreier <roland@digitalvampire.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/sockios.h')
| -rw-r--r-- | include/asm-x86/sockios.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/asm-x86/sockios.h b/include/asm-x86/sockios.h index 5a134fc70b9c..49cc72b5d3c9 100644 --- a/include/asm-x86/sockios.h +++ b/include/asm-x86/sockios.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifndef _ASM_X86_SOCKIOS_H |
| 2 | # ifdef CONFIG_X86_32 | 2 | #define _ASM_X86_SOCKIOS_H |
| 3 | # include "sockios_32.h" | 3 | |
| 4 | # else | 4 | /* Socket-level I/O control calls. */ |
| 5 | # include "sockios_64.h" | 5 | #define FIOSETOWN 0x8901 |
| 6 | # endif | 6 | #define SIOCSPGRP 0x8902 |
| 7 | #else | 7 | #define FIOGETOWN 0x8903 |
| 8 | # ifdef __i386__ | 8 | #define SIOCGPGRP 0x8904 |
| 9 | # include "sockios_32.h" | 9 | #define SIOCATMARK 0x8905 |
| 10 | # else | 10 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ |
| 11 | # include "sockios_64.h" | 11 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ |
| 12 | # endif | 12 | |
| 13 | #endif | 13 | #endif /* _ASM_X86_SOCKIOS_H */ |