diff --git a/[refs] b/[refs] index d8eb5e5c4d96..e9178ab00a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12003375acd879e498c6c511faf27531296f9640 +refs/heads/master: b6043fcab4b2b06b9fcde4c783ab253cdc2c1129 diff --git a/trunk/drivers/w1/w1_netlink.h b/trunk/drivers/w1/w1_netlink.h index 5644221f9a44..56122b9e9294 100644 --- a/trunk/drivers/w1/w1_netlink.h +++ b/trunk/drivers/w1/w1_netlink.h @@ -27,9 +27,6 @@ #include "w1.h" -#define CN_W1_IDX 3 -#define CN_W1_VAL 1 - enum w1_netlink_message_types { W1_SLAVE_ADD = 0, W1_SLAVE_REMOVE, diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h index ad1a22c1c42e..4c02119c6ab9 100644 --- a/trunk/include/linux/connector.h +++ b/trunk/include/linux/connector.h @@ -34,8 +34,11 @@ #define CN_VAL_PROC 0x1 #define CN_IDX_CIFS 0x2 #define CN_VAL_CIFS 0x1 +#define CN_W1_IDX 0x3 /* w1 communication */ +#define CN_W1_VAL 0x1 -#define CN_NETLINK_USERS 1 + +#define CN_NETLINK_USERS 4 /* * Maximum connector's message size.