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.infradead.org/mtd-2.6
[pandora-kernel.git]
/
include
/
asm-s390
/
socket.h
diff --git
a/include/asm-s390/socket.h
b/include/asm-s390/socket.h
index
1161ebe
..
c786ab6
100644
(file)
--- a/
include/asm-s390/socket.h
+++ b/
include/asm-s390/socket.h
@@
-60,4
+60,6
@@
#define SO_TIMESTAMPNS 35
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
+#define SO_MARK 36
+
#endif /* _ASM_SOCKET_H */