spidev: BKL removal

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

diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h
index d22ab97ea72efc27e45ef4573498baef7c3a1059..a1057c2d95e7047e06ab1c9df73392b9f49e8ab6 100644 (file)
--- a/include/asm-alpha/socket.h
+++ b/include/asm-alpha/socket.h
@@ -52,10 +52,19 @@
 
 #define SO_PEERSEC             30
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION             19
 #define SO_SECURITY_ENCRYPTION_TRANSPORT       20
 #define SO_SECURITY_ENCRYPTION_NETWORK         21
 
+#define SO_MARK                        36
+
+/* O_NONBLOCK clashes with the bits used for socket types.  Therefore we
+ * have to define SOCK_NONBLOCK to a different value here.
+ */
+#define SOCK_NONBLOCK  0x40000000
+
 #endif /* _ASM_SOCKET_H */