Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / include / asm-s390 / socket.h

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