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

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

diff --git a/include/asm-v850/socket.h b/include/asm-v850/socket.h
index 0240d366a0a4db32672c6e20c734efe21e32aa17..a4c2493b025feffb3ddb596e4a0072c28b88eb89 100644 (file)
--- a/include/asm-v850/socket.h
+++ b/include/asm-v850/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 /* __V850_SOCKET_H__ */