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

[mv-sheeva.git] / include / asm-s390 / socket.h

diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h
index 15a5298c8744bf1401be8b0cb736b406b410d55d..1161ebe3dec9530cc0ac416722ad6c15a79de8e5 100644 (file)
--- a/include/asm-s390/socket.h
+++ b/include/asm-s390/socket.h
@@ -56,5 +56,8 @@
 #define SO_ACCEPTCONN          30
 
 #define SO_PEERSEC             31
+#define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_SOCKET_H */