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
Pull cpumask into release branch
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
include
/
asm
/
socket.h
diff --git
a/arch/m68k/include/asm/socket.h
b/arch/m68k/include/asm/socket.h
index dbc64e92c41ac572bd80b99790f80977ed5e8c75..ca87f938b03f15ac041492791bab3e3e5aceca27 100644
(file)
--- a/
arch/m68k/include/asm/socket.h
+++ b/
arch/m68k/include/asm/socket.h
@@
-54,4
+54,7
@@
#define SO_MARK 36
+#define SO_TIMESTAMPING 37
+#define SCM_TIMESTAMPING SO_TIMESTAMPING
+
#endif /* _ASM_SOCKET_H */