diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/asm-mips/socket.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-mips/socket.h')
| -rw-r--r-- | include/asm-mips/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index 36ebe4e186a7..95945689b1c6 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h | |||
| @@ -70,6 +70,8 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ | |||
| 70 | #define SO_SNDBUFFORCE 31 | 70 | #define SO_SNDBUFFORCE 31 |
| 71 | #define SO_RCVBUFFORCE 33 | 71 | #define SO_RCVBUFFORCE 33 |
| 72 | #define SO_PASSSEC 34 | 72 | #define SO_PASSSEC 34 |
| 73 | #define SO_TIMESTAMPNS 35 | ||
| 74 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
| 73 | 75 | ||
| 74 | #ifdef __KERNEL__ | 76 | #ifdef __KERNEL__ |
| 75 | 77 | ||