projects
/
linux-2.6
/ 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/sparc-2.6
[linux-2.6]
/
include
/
asm-frv
/
socket.h
diff --git
a/include/asm-frv/socket.h
b/include/asm-frv/socket.h
index
7177f8b
..
e51ca67
100644
(file)
--- a/
include/asm-frv/socket.h
+++ b/
include/asm-frv/socket.h
@@
-48,6
+48,11
@@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
+#define SO_TIMESTAMPNS 35
+#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
+
+#define SO_MARK 36
#endif /* _ASM_SOCKET_H */