git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
socket.h
diff --git
a/arch/ia64/include/asm/socket.h
b/arch/ia64/include/asm/socket.h
index
d5ef0aa
..
7454212
100644
(file)
--- a/
arch/ia64/include/asm/socket.h
+++ b/
arch/ia64/include/asm/socket.h
@@
-63,4
+63,7
@@
#define SO_MARK 36
#define SO_MARK 36
+#define SO_TIMESTAMPING 37
+#define SCM_TIMESTAMPING SO_TIMESTAMPING
+
#endif /* _ASM_IA64_SOCKET_H */
#endif /* _ASM_IA64_SOCKET_H */