[PATCH] w1: Move w1-connector definitions into linux/include/connector.h

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/w1/w1_netlink.h b/drivers/w1/w1_netlink.h
index 5644221f9a44f3326e56e1e4b2107bbe5434f62a..56122b9e9294b865f30da01730c16ac0a4728dc3 100644 (file)
--- a/drivers/w1/w1_netlink.h
+++ b/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/include/linux/connector.h b/include/linux/connector.h
index ad1a22c1c42e24e2c2e0b93e4f090810ccb43a17..4c02119c6ab9d6ef16158ad6f9a35f54f4493e4e 100644 (file)
--- a/include/linux/connector.h
+++ b/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.