diff options
author | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-28 14:57:13 +1100 |
commit | bb798169d1bb860b07192cf9c75937fadc8610b4 (patch) | |
tree | fa67f14406a1e79897e6f29e59fed7c02ec31c30 /arch/cris/include/asm/socket.h | |
parent | a106cbfd1f3703402fc2d95d97e7a054102250f0 (diff) | |
parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/cris/include/asm/socket.h')
-rw-r--r-- | arch/cris/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/cris/include/asm/socket.h b/arch/cris/include/asm/socket.h index 9df0ca82f5d..d5cf7400540 100644 --- a/arch/cris/include/asm/socket.h +++ b/arch/cris/include/asm/socket.h @@ -56,6 +56,9 @@ #define SO_MARK 36 +#define SO_TIMESTAMPING 37 +#define SCM_TIMESTAMPING SO_TIMESTAMPING + #endif /* _ASM_SOCKET_H */ |