Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / socket.h

diff --git a/include/asm-arm/socket.h b/include/asm-arm/socket.h
index 65a1a64bf9340b2b8ec8d4321d26c1deb968739a..6817be9573a6bf65d29ef5092a4a869017cf87bc 100644 (file)
--- a/include/asm-arm/socket.h
+++ b/include/asm-arm/socket.h
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
 #endif /* _ASM_SOCKET_H */