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

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

diff --git a/include/asm-cris/socket.h b/include/asm-cris/socket.h
index 01cfdf1..9df0ca8 100644 (file)
--- a/include/asm-cris/socket.h
+++ b/include/asm-cris/socket.h
@@ -51,6 +51,10 @@
 
 #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 */