diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/s390/include/asm/sockios.h | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/s390/include/asm/sockios.h')
| -rw-r--r-- | arch/s390/include/asm/sockios.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/s390/include/asm/sockios.h b/arch/s390/include/asm/sockios.h index f4fc16c7da59..6f60eee73242 100644 --- a/arch/s390/include/asm/sockios.h +++ b/arch/s390/include/asm/sockios.h | |||
| @@ -1,21 +1,6 @@ | |||
| 1 | /* | 1 | #ifndef _ASM_S390_SOCKIOS_H |
| 2 | * include/asm-s390/sockios.h | 2 | #define _ASM_S390_SOCKIOS_H |
| 3 | * | ||
| 4 | * S390 version | ||
| 5 | * | ||
| 6 | * Derived from "include/asm-i386/sockios.h" | ||
| 7 | */ | ||
| 8 | 3 | ||
| 9 | #ifndef __ARCH_S390_SOCKIOS__ | 4 | #include <asm-generic/sockios.h> |
| 10 | #define __ARCH_S390_SOCKIOS__ | ||
| 11 | |||
| 12 | /* Socket-level I/O control calls. */ | ||
| 13 | #define FIOSETOWN 0x8901 | ||
| 14 | #define SIOCSPGRP 0x8902 | ||
| 15 | #define FIOGETOWN 0x8903 | ||
| 16 | #define SIOCGPGRP 0x8904 | ||
| 17 | #define SIOCATMARK 0x8905 | ||
| 18 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ | ||
| 19 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
| 20 | 5 | ||
| 21 | #endif | 6 | #endif |