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-cris/socket.h | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-cris/socket.h')
| -rw-r--r-- | include/asm-cris/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-cris/socket.h b/include/asm-cris/socket.h index 01cfdf1d6d33..5b18dfdf1748 100644 --- a/include/asm-cris/socket.h +++ b/include/asm-cris/socket.h | |||
| @@ -51,6 +51,8 @@ | |||
| 51 | 51 | ||
| 52 | #define SO_PEERSEC 31 | 52 | #define SO_PEERSEC 31 |
| 53 | #define SO_PASSSEC 34 | 53 | #define SO_PASSSEC 34 |
| 54 | #define SO_TIMESTAMPNS 35 | ||
| 55 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
| 54 | 56 | ||
| 55 | #endif /* _ASM_SOCKET_H */ | 57 | #endif /* _ASM_SOCKET_H */ |
| 56 | 58 | ||