Merge Linux 2.6.23

[linux-2.6-omap-h63xx.git] / include / asm-m32r / socket.h

diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h
index 8b6680f223c0b4a5f18781f36129cc1d541b68f8..793d5d30c8505f03ddb1c0e8801c771177f7e82e 100644 (file)
--- a/include/asm-m32r/socket.h
+++ b/include/asm-m32r/socket.h
@@ -48,5 +48,8 @@
 #define SO_ACCEPTCONN          30
 
 #define SO_PEERSEC             31
+#define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_M32R_SOCKET_H */