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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
arch
/
cris
/
include
/
asm
/
socket.h
diff --git
a/arch/cris/include/asm/socket.h
b/arch/cris/include/asm/socket.h
index
9df0ca8
..
d5cf740
100644
(file)
--- a/
arch/cris/include/asm/socket.h
+++ b/
arch/cris/include/asm/socket.h
@@
-56,6
+56,9
@@
#define SO_MARK 36
+#define SO_TIMESTAMPING 37
+#define SCM_TIMESTAMPING SO_TIMESTAMPING
+
#endif /* _ASM_SOCKET_H */