Merge branch 'linux-2.6'

[linux-2.6] / include / linux / socket.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index f852e1afd65a74ee34400b7bc4d9ef668d38a62c..c22ef1c1afb803e651a2b656a0add216e5d98590 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -291,6 +291,7 @@ struct ucred {
 #define SOL_TIPC       271
 #define SOL_RXRPC      272
 #define SOL_PPPOL2TP   273
+#define SOL_BLUETOOTH  274
 
 /* IPX options */
 #define IPX_TYPE       1