Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / include / asm-frv / socket.h

diff --git a/include/asm-frv/socket.h b/include/asm-frv/socket.h
index a823befd11dd8f8ce35c0d3080717032d4c16d87..57c3d4054e8bd9bf082eb151d632b0ab841f9035 100644 (file)
--- a/include/asm-frv/socket.h
+++ b/include/asm-frv/socket.h
@@ -52,5 +52,10 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
+#define SO_TIMESTAMPING                37
+#define SCM_TIMESTAMPING       SO_TIMESTAMPING
+
 #endif /* _ASM_SOCKET_H */