git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-sh
/
socket.h
diff --git
a/include/asm-sh/socket.h
b/include/asm-sh/socket.h
index 553904ff9336c2e26304810e0f0db20e0f4a4220..c48d6fc9da3866da5fc5fa3e70d5ec76f654801b 100644
(file)
--- a/
include/asm-sh/socket.h
+++ b/
include/asm-sh/socket.h
@@
-48,5
+48,8
@@
#define SO_ACCEPTCONN 30
#define SO_PEERSEC 31
+#define SO_PASSSEC 34
+#define SO_TIMESTAMPNS 35
+#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
#endif /* __ASM_SH_SOCKET_H */