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 branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
include
/
asm-frv
/
socket.h
diff --git
a/include/asm-frv/socket.h
b/include/asm-frv/socket.h
index
a823bef
..
e51ca67
100644
(file)
--- a/
include/asm-frv/socket.h
+++ b/
include/asm-frv/socket.h
@@
-52,5
+52,7
@@
#define SO_TIMESTAMPNS 35
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
#define SO_TIMESTAMPNS 35
#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
+#define SO_MARK 36
+
#endif /* _ASM_SOCKET_H */
#endif /* _ASM_SOCKET_H */