projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release' and 'menlo' into release
[linux-2.6-block.git]
/
include
/
asm-m32r
/
socket.h
diff --git
a/include/asm-m32r/socket.h
b/include/asm-m32r/socket.h
index 8b6680f223c0b4a5f18781f36129cc1d541b68f8..9a0e200122249e5cae09d90d73b01d820dbe9e83 100644
(file)
--- a/
include/asm-m32r/socket.h
+++ b/
include/asm-m32r/socket.h
@@
-48,5
+48,10
@@
#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_M32R_SOCKET_H */