Merge branch 'linus' into cpus4096
[linux-2.6] / include / asm-powerpc / socket.h
index 403e9fd..f5a4e16 100644 (file)
@@ -59,4 +59,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
 #endif /* _ASM_POWERPC_SOCKET_H */