Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

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

diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h
index 5755d57c4e952c121a0a215c94778cbf1c1386e6..99ca648b94c54122057342ec4bcef093b0d0fbe6 100644 (file)
--- a/include/asm-i386/socket.h
+++ b/include/asm-i386/socket.h
@@ -49,5 +49,7 @@
 
 #define SO_PEERSEC             31
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_SOCKET_H */