diff options
| author | Roland Dreier <roland@digitalvampire.org> | 2007-10-15 13:57:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:17:09 +0200 |
| commit | 217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch) | |
| tree | 1f3ba24177455aeadcf065b9157ccac9252c7cfc /include/asm-x86/sockios.h | |
| parent | 020bd9f1c766ca743556461a70a5b5d559b7e60c (diff) | |
| download | linux-3.10-217d115cd5d7d2bef7db7839b93ce5dc2867c392.tar.gz linux-3.10-217d115cd5d7d2bef7db7839b93ce5dc2867c392.tar.bz2 linux-3.10-217d115cd5d7d2bef7db7839b93ce5dc2867c392.zip | |
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 5a134fc70b9..49cc72b5d3c 100644 --- a/include/asm-x86/sockios.h +++ b/include/asm-x86/sockios.h @@ -1,13 +1,13 @@ -#ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "sockios_32.h" -# else -# include "sockios_64.h" -# endif -#else -# ifdef __i386__ -# include "sockios_32.h" -# else -# include "sockios_64.h" -# endif -#endif +#ifndef _ASM_X86_SOCKIOS_H +#define _ASM_X86_SOCKIOS_H + +/* Socket-level I/O control calls. */ +#define FIOSETOWN 0x8901 +#define SIOCSPGRP 0x8902 +#define FIOGETOWN 0x8903 +#define SIOCGPGRP 0x8904 +#define SIOCATMARK 0x8905 +#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ +#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ + +#endif /* _ASM_X86_SOCKIOS_H */ |