Merge commit 'origin/master' into next

[sfrench/cifs-2.6.git] / arch / blackfin / include / asm / socket.h

diff --git a/arch/blackfin/include/asm/socket.h b/arch/blackfin/include/asm/socket.h
index 2ca702e44d4759420051ed73dc9c3662eb2fb5c4..fac7fe9e1f8a670f85b1119e1ddfd98a34ae5255 100644 (file)
--- a/arch/blackfin/include/asm/socket.h
+++ b/arch/blackfin/include/asm/socket.h
@@ -53,4 +53,7 @@
 
 #define SO_MARK                        36
 
+#define SO_TIMESTAMPING                37
+#define SCM_TIMESTAMPING       SO_TIMESTAMPING
+
 #endif                         /* _ASM_SOCKET_H */