Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h
index 1778a49a74c5b0fd24facee8d5d49fc3657f3600..1161ebe3dec9530cc0ac416722ad6c15a79de8e5 100644 (file)
--- a/include/asm-s390/socket.h
+++ b/include/asm-s390/socket.h
@@ -57,5 +57,7 @@
 
 #define SO_PEERSEC             31
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_SOCKET_H */