diff options
-rw-r--r-- | drivers/w1/w1_netlink.h | 3 | ||||
-rw-r--r-- | include/linux/connector.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h index 5644221f9a44..56122b9e9294 100644 --- a/drivers/w1/w1_netlink.h +++ b/drivers/w1/w1_netlink.h | |||
@@ -27,9 +27,6 @@ | |||
27 | 27 | ||
28 | #include "w1.h" | 28 | #include "w1.h" |
29 | 29 | ||
30 | #define CN_W1_IDX 3 | ||
31 | #define CN_W1_VAL 1 | ||
32 | |||
33 | enum w1_netlink_message_types { | 30 | enum w1_netlink_message_types { |
34 | W1_SLAVE_ADD = 0, | 31 | W1_SLAVE_ADD = 0, |
35 | W1_SLAVE_REMOVE, | 32 | W1_SLAVE_REMOVE, |
diff --git a/include/linux/connector.h b/include/linux/connector.h index ad1a22c1c42e..4c02119c6ab9 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
@@ -34,8 +34,11 @@ | |||
34 | #define CN_VAL_PROC 0x1 | 34 | #define CN_VAL_PROC 0x1 |
35 | #define CN_IDX_CIFS 0x2 | 35 | #define CN_IDX_CIFS 0x2 |
36 | #define CN_VAL_CIFS 0x1 | 36 | #define CN_VAL_CIFS 0x1 |
37 | #define CN_W1_IDX 0x3 /* w1 communication */ | ||
38 | #define CN_W1_VAL 0x1 | ||
37 | 39 | ||
38 | #define CN_NETLINK_USERS 1 | 40 | |
41 | #define CN_NETLINK_USERS 4 | ||
39 | 42 | ||
40 | /* | 43 | /* |
41 | * Maximum connector's message size. | 44 | * Maximum connector's message size. |