Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

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

diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h
index a5966ec005ae67d1bdb338aa209f1cf76f85bf78..dbc64e92c41ac572bd80b99790f80977ed5e8c75 100644 (file)
--- a/include/asm-m68k/socket.h
+++ b/include/asm-m68k/socket.h
@@ -49,5 +49,9 @@
 
 #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 */