Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...

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

diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h
index a5966ec005ae67d1bdb338aa209f1cf76f85bf78..6d21b90863ad1220d8f614e7b071f7bbc62d8f89 100644 (file)
--- a/include/asm-m68k/socket.h
+++ b/include/asm-m68k/socket.h
@@ -49,5 +49,7 @@
 
 #define SO_PEERSEC             31
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_SOCKET_H */