Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h
index a255006fb7b51f0db085e82f547f25938ee7c84c..9e42ce43cfbeaf92007e07119af6d82c16df5bae 100644 (file)
--- a/include/asm-ia64/socket.h
+++ b/include/asm-ia64/socket.h
@@ -57,5 +57,8 @@
 #define SO_ACCEPTCONN          30
 
 #define SO_PEERSEC             31
+#define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_IA64_SOCKET_H */