Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / include / asm-xtensa / socket.h

diff --git a/include/asm-xtensa/socket.h b/include/asm-xtensa/socket.h
index 971d231be60ebe095f9a5b29e21831662df2e1f8..1f5aeacb9da27ead7b2623a74f7a557717bfc2c0 100644 (file)
--- a/include/asm-xtensa/socket.h
+++ b/include/asm-xtensa/socket.h
@@ -60,5 +60,7 @@
 #define SO_ACCEPTCONN          30
 #define SO_PEERSEC             31
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _XTENSA_SOCKET_H */