Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / include / asm-mips / socket.h

diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h
index 36ebe4e186a7a635970909c46f03cd8b394bc367..95945689b1c669193b20765a1d202bebecca8b1a 100644 (file)
--- 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.  */
 #define SO_SNDBUFFORCE         31
 #define SO_RCVBUFFORCE         33
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #ifdef __KERNEL__